diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-03 02:32:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-03 02:32:58 +0200 |
| commit | 18b233428a9899d3c725d1168a94898c508b35b5 (patch) | |
| tree | af2821a7d53e918123285e8ab127ba92082b3b00 | |
| parent | c437ab3c4ea2578e68e39e4bf32dda2ff6a1ed07 (diff) | |
| parent | 079758e49a4d6b3e7cf2e22bed71d34c46712242 (diff) | |
| download | ffmpeg-18b233428a9899d3c725d1168a94898c508b35b5.tar.gz | |
Merge commit '079758e49a4d6b3e7cf2e22bed71d34c46712242' into release/0.10
* commit '079758e49a4d6b3e7cf2e22bed71d34c46712242':
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 7575bfd551..1ec3f77e8f 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1300,6 +1300,8 @@ int ff_h264_frame_start(H264Context *h){ int i; const int pixel_shift = h->pixel_shift; + h->next_output_pic = NULL; + if(MPV_frame_start(s, s->avctx) < 0) return -1; ff_er_frame_start(s); @@ -1349,8 +1351,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; |