diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-27 23:36:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-27 23:37:19 +0200 |
| commit | f01e3c5d000d264b2935e186594a37a3c00f9465 (patch) | |
| tree | e5d126e20c4eae7084ec809aa320a173683ee250 | |
| parent | e3ec2cde2c394af6c9b64bccd39bc206a88a4e58 (diff) | |
| parent | 43dd004747fa697396b47d034a80e069facbea09 (diff) | |
| download | ffmpeg-f01e3c5d000d264b2935e186594a37a3c00f9465.tar.gz | |
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>
| -rw-r--r-- | libavcodec/hapdec.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libavcodec/hapdec.c b/libavcodec/hapdec.c index 5c2c20b5e1..e2713fcc69 100644 --- a/libavcodec/hapdec.c +++ b/libavcodec/hapdec.c @@ -162,10 +162,11 @@ static int hap_parse_frame_header(AVCodecContext *avctx) if (ret != 0) return ret; - if ((avctx->codec_tag == MKTAG('H','a','p','1') && (section_type & 0x0F) != HAP_FMT_RGBDXT1) - || (avctx->codec_tag == MKTAG('H','a','p','5') && (section_type & 0x0F) != HAP_FMT_RGBADXT5) - || (avctx->codec_tag == MKTAG('H','a','p','Y') && (section_type & 0x0F) != HAP_FMT_YCOCGDXT5)) { - av_log(avctx, AV_LOG_ERROR, "Invalid texture format %#04x.\n", section_type & 0x0F); + if ((avctx->codec_tag == MKTAG('H','a','p','1') && (section_type & 0x0F) != HAP_FMT_RGBDXT1) || + (avctx->codec_tag == MKTAG('H','a','p','5') && (section_type & 0x0F) != HAP_FMT_RGBADXT5) || + (avctx->codec_tag == MKTAG('H','a','p','Y') && (section_type & 0x0F) != HAP_FMT_YCOCGDXT5)) { + av_log(avctx, AV_LOG_ERROR, + "Invalid texture format %#04x.\n", section_type & 0x0F); return AVERROR_INVALIDDATA; } |