diff options
| author | Howard Chu <hyc@highlandsun.com> | 2010-05-28 20:14:14 +0000 |
|---|---|---|
| committer | Howard Chu <hyc@highlandsun.com> | 2010-05-28 20:14:14 +0000 |
| commit | 82f1ffc7ba5efc6a99570fa4936b9453e838ca03 (patch) | |
| tree | eed13bed69a6179ee7dbddc576bf21c34e58c8f8 /libavcodec | |
| parent | 23584bec87f2cab947e28ba54b0499492d6e5891 (diff) | |
| download | ffmpeg-82f1ffc7ba5efc6a99570fa4936b9453e838ca03.tar.gz | |
Cleanup prev commit, flag variable should start with 0
Originally committed as revision 23364 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264.h | 2 | ||||
| -rw-r--r-- | libavcodec/h264_parser.c | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 7c76b29453..0922ede6f7 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -464,8 +464,8 @@ typedef struct H264Context{ */ int is_avc; ///< this flag is != 0 if codec is avc1 int nal_length_size; ///< Number of bytes used for nal length (1, 2 or 4) + int got_first; ///< this flag is != 0 if we've parsed a frame - int first_picture; SPS *sps_buffers[MAX_SPS_COUNT]; PPS *pps_buffers[MAX_PPS_COUNT]; diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c index 06271cf41c..890e0a8930 100644 --- a/libavcodec/h264_parser.c +++ b/libavcodec/h264_parser.c @@ -245,8 +245,8 @@ static int h264_parse(AVCodecParserContext *s, ParseContext *pc = &h->s.parse_context; int next; - if (h->first_picture) { - h->first_picture = 0; + if (!h->got_first) { + h->got_first = 1; if (avctx->extradata_size) { h->s.avctx = avctx; ff_h264_decode_extradata(h); @@ -327,7 +327,6 @@ static int init(AVCodecParserContext *s) { H264Context *h = s->priv_data; h->thread_context[0] = h; - h->first_picture = 1; return 0; } |