Browse code

Merge commit '43dd004747fa697396b47d034a80e069facbea09'

* commit '43dd004747fa697396b47d034a80e069facbea09':
hap: Move some per-stream setup into decoder init rather than per-frame

Conflicts:
libavcodec/hapdec.c

See: 6074956fa1d2617ac602e49931b06df0a751370e
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Michael Niedermayer authored on 2015/07/28 06:36:37
Showing 1 changed files
... ...
@@ -162,10 +162,11 @@ static int hap_parse_frame_header(AVCodecContext *avctx)
162 162
     if (ret != 0)
163 163
         return ret;
164 164
 
165
-    if ((avctx->codec_tag == MKTAG('H','a','p','1') && (section_type & 0x0F) != HAP_FMT_RGBDXT1)
166
-        || (avctx->codec_tag == MKTAG('H','a','p','5') && (section_type & 0x0F) != HAP_FMT_RGBADXT5)
167
-        || (avctx->codec_tag == MKTAG('H','a','p','Y') && (section_type & 0x0F) != HAP_FMT_YCOCGDXT5)) {
168
-        av_log(avctx, AV_LOG_ERROR, "Invalid texture format %#04x.\n", section_type & 0x0F);
165
+    if ((avctx->codec_tag == MKTAG('H','a','p','1') && (section_type & 0x0F) != HAP_FMT_RGBDXT1) ||
166
+        (avctx->codec_tag == MKTAG('H','a','p','5') && (section_type & 0x0F) != HAP_FMT_RGBADXT5) ||
167
+        (avctx->codec_tag == MKTAG('H','a','p','Y') && (section_type & 0x0F) != HAP_FMT_YCOCGDXT5)) {
168
+        av_log(avctx, AV_LOG_ERROR,
169
+               "Invalid texture format %#04x.\n", section_type & 0x0F);
169 170
         return AVERROR_INVALIDDATA;
170 171
     }
171 172