diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-04 22:14:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-04 22:14:45 +0200 |
| commit | ebefc92a3dcd88d2b5e97c221f7d1cff657a1e60 (patch) | |
| tree | be084e4394c13c6621c741f58ebd8e6f995f12e8 | |
| parent | 11b3462aa347f65f296ba31140eaf32590c575b5 (diff) | |
| parent | 945a1b7ab9b9df317e175e480a135a41e7e05b5c (diff) | |
| download | ffmpeg-ebefc92a3dcd88d2b5e97c221f7d1cff657a1e60.tar.gz | |
Merge commit '945a1b7ab9b9df317e175e480a135a41e7e05b5c' into release/1.1
* commit '945a1b7ab9b9df317e175e480a135a41e7e05b5c':
h264: reset next_output_pic earlier in start_frame()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/h264.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 386ba7ea37..9599b1486c 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1337,6 +1337,8 @@ int ff_h264_frame_start(H264Context *h) int i; const int pixel_shift = h->pixel_shift; + h->next_output_pic = NULL; + if (ff_MPV_frame_start(s, s->avctx) < 0) return -1; ff_er_frame_start(s); @@ -1389,8 +1391,6 @@ int ff_h264_frame_start(H264Context *h) s->current_picture_ptr->field_poc[0] = s->current_picture_ptr->field_poc[1] = INT_MAX; - h->next_output_pic = NULL; - assert(s->current_picture_ptr->long_ref == 0); return 0; |