diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-22 19:17:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-22 19:19:28 +0200 |
| commit | 4aeafbaab891d81c377f92be3969d8d3e6abf379 (patch) | |
| tree | b2f5af6cc5ba152e6c5df9fa1f3e43edc75727a2 /libavcodec/h264_parser.c | |
| parent | 3e1483d03e8e2439b4c31d782bb7126ba1afdc6c (diff) | |
| parent | 103d073dd7ce23b912df32be8c9524ba25dd5991 (diff) | |
| download | android_external_ffmpeg-4aeafbaab891d81c377f92be3969d8d3e6abf379.tar.gz android_external_ffmpeg-4aeafbaab891d81c377f92be3969d8d3e6abf379.tar.bz2 android_external_ffmpeg-4aeafbaab891d81c377f92be3969d8d3e6abf379.zip | |
Merge commit '103d073dd7ce23b912df32be8c9524ba25dd5991'
* commit '103d073dd7ce23b912df32be8c9524ba25dd5991':
h264_parser: Use ff_h264_reset_sei()
Conflicts:
libavcodec/h264_parser.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_parser.c')
| -rw-r--r-- | libavcodec/h264_parser.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c index 2bf6277a37..4e29f5cbd5 100644 --- a/libavcodec/h264_parser.c +++ b/libavcodec/h264_parser.c @@ -215,11 +215,8 @@ static inline int parse_nal_units(AVCodecParserContext *s, s->key_frame = 0; s->picture_structure = AV_PICTURE_STRUCTURE_UNKNOWN; - h->avctx = avctx; - h->sei_recovery_frame_cnt = -1; - h->sei_dpb_output_delay = 0; - h->sei_cpb_removal_delay = -1; - h->sei_buffering_period_present = 0; + h->avctx = avctx; + ff_h264_reset_sei(h); h->sei_fpa.frame_packing_arrangement_cancel_flag = -1; if (!buf_size) |