diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-18 21:45:58 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-18 21:51:40 +0100 |
commit | 329610303aac5f42a01c16ccb4e9fea2075b38d3 (patch) | |
tree | aec96d45723f0732d60015a58d9e5596796f75b3 /libavcodec | |
parent | f2cb3b36aca220a05ddb797e2d9c220613a3755f (diff) | |
parent | 00dbff4c3e048b4abd01bf805725aabff0fa5ee1 (diff) | |
download | ffmpeg-329610303aac5f42a01c16ccb4e9fea2075b38d3.tar.gz |
Merge commit '00dbff4c3e048b4abd01bf805725aabff0fa5ee1'
* commit '00dbff4c3e048b4abd01bf805725aabff0fa5ee1':
h264: do not call field_end if we do not have a current picture
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/h264.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index b749c77b93..5699051fef 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -3455,7 +3455,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0) first_mb_in_slice = get_ue_golomb_long(&h->gb); if (first_mb_in_slice == 0) { // FIXME better field boundary detection - if (h0->current_slice && FIELD_PICTURE(h)) { + if (h0->current_slice && h->cur_pic_ptr && FIELD_PICTURE(h)) { field_end(h, 1); } |