diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 11:33:36 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 12:59:08 +0100 |
| commit | 78265fcfeee153e5e26ad4dbc7831a84ade447d6 (patch) | |
| tree | 92bc81fca00966f3c867baa7dd339eb5c62730c4 /libavcodec/h264_refs.c | |
| parent | 2acc525d786f0ee4b0a354858a5f146ce6580658 (diff) | |
| parent | 28096e0a806e57376541e6222d315619906e3c55 (diff) | |
| download | ffmpeg-78265fcfeee153e5e26ad4dbc7831a84ade447d6.tar.gz | |
Merge commit '28096e0a806e57376541e6222d315619906e3c55'
* commit '28096e0a806e57376541e6222d315619906e3c55':
h264: wait for initial complete frame before outputing frames
Conflicts:
doc/APIchanges
libavcodec/h264.c
libavcodec/mpegvideo.h
libavutil/frame.h
libavutil/version.h
See: a64b028aeb6579636e578ceb73f69b468bddb2f0 (as well as various later commits)
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_refs.c')
| -rw-r--r-- | libavcodec/h264_refs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c index 27ca8f8163..e9f32d7080 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -733,9 +733,9 @@ int ff_h264_execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count) print_long_term(h); if(err >= 0 && h->long_ref_count==0 && h->short_ref_count<=2 && h->pps.ref_count[0]<=2 + (h->picture_structure != PICT_FRAME) && h->cur_pic_ptr->f.pict_type == AV_PICTURE_TYPE_I){ - h->cur_pic_ptr->sync |= 1; + h->cur_pic_ptr->recovered |= 1; if(!h->avctx->has_b_frames) - h->sync = 2; + h->frame_recovered = 2; } return (h->avctx->err_recognition & AV_EF_EXPLODE) ? err : 0; |