aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/h264.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-09-23 05:43:32 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-09-23 06:01:45 +0200
commit9b73fbcff62267a355f752d83e26cd6d971e975e (patch)
treef6ab50197ce322719e480a832c25d02f0fec6250 /libavcodec/h264.c
parent4ba396834d2bf36be9b9f235de91af54da2c46ba (diff)
downloadffmpeg-9b73fbcff62267a355f752d83e26cd6d971e975e.tar.gz
h264dec: Decode in stream avc extradata.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.c')
-rw-r--r--libavcodec/h264.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index a2250f419b..aeb36f2ff7 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -3911,6 +3911,8 @@ static int decode_frame(AVCodecContext *avctx,
return 0;
}
+ if(h->is_avc && AV_RB32(buf)==0x0164001F && buf[5] && buf[8]==0x67)
+ return ff_h264_decode_extradata(h, buf, buf_size);
buf_index=decode_nal_units(h, buf, buf_size);
if(buf_index < 0)