aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Oligny-Lemieux <eucloid@gmail.com>2007-02-09 22:25:29 +0000
committerGuillaume Poirier <gpoirier@mplayerhq.hu>2007-02-09 22:25:29 +0000
commit6ff9b4226b0e81d754dfcf1587e859da90aa76c9 (patch)
treeb3d9cc7b933b3c612cb3c24ef44d9e497e1c9bed
parent2d241e6687202ceca5edc7c9a82fa23b3111a2c1 (diff)
downloadffmpeg-6ff9b4226b0e81d754dfcf1587e859da90aa76c9.tar.gz
always decode extradata when of non-avc stream (like RTSP)
Patch by Francois Oligny-Lemieux % eucloid A gmail P com % Original thread: Date: Feb 9, 2007 12:00 AM Subject: [Ffmpeg-devel] h264.c patch, always decoding extradata when on non avc stream Originally committed as revision 7904 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/h264.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index d696676f02..581572031f 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -8314,7 +8314,7 @@ static int decode_frame(AVCodecContext *avctx,
h->got_avcC = 1;
}
- if(!h->is_avc && s->avctx->extradata_size && s->picture_number==0){
+ if(avctx->frame_number==0 && !h->is_avc && s->avctx->extradata_size){
if(decode_nal_units(h, s->avctx->extradata, s->avctx->extradata_size) < 0)
return -1;
}