diff options
| author | Michael Niedermayer <[email protected]> | 2014-04-21 15:28:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-04-21 15:28:24 +0200 |
| commit | 11dfd2a74a331f47135d3e0bcd5d503750e66004 (patch) | |
| tree | cc5af502ff34eb720eeeda4c7ddf82bf0f20169a | |
| parent | f6c1fdba22dc9f1e8a676949e9d404907ceda10c (diff) | |
| parent | 7fd6c9fb49573870b48a995947edc83eedd7e86e (diff) | |
Merge commit '7fd6c9fb49573870b48a995947edc83eedd7e86e' into release/1.1
* commit '7fd6c9fb49573870b48a995947edc83eedd7e86e':
h264: reset first_field if frame_start() fails for missing refs
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <[email protected]>
| -rw-r--r-- | libavcodec/h264.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 3851070158..638f258c40 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2990,8 +2990,10 @@ static int decode_slice_header(H264Context *h, H264Context *h0) if (!h->sps.gaps_in_frame_num_allowed_flag) for(i=0; i<FF_ARRAY_ELEMS(h->last_pocs); i++) h->last_pocs[i] = INT_MIN; - if (ff_h264_frame_start(h) < 0) + if (ff_h264_frame_start(h) < 0) { + s0->first_field = 0; return -1; + } h->prev_frame_num++; h->prev_frame_num %= 1 << h->sps.log2_max_frame_num; s->current_picture_ptr->frame_num = h->prev_frame_num; |