diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-30 14:49:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-30 14:49:13 +0100 |
| commit | db29a7c7c2822a2f2e9804988e279a9fe7d88c11 (patch) | |
| tree | 04fb612effd1e808baf292466197027e8b68b924 /libavcodec/h264.c | |
| parent | 8119d8b01f8391f11c447802782e9017ad419d99 (diff) | |
| parent | 9d46eaec7a90bd8f5cd9e45398c6d17804182320 (diff) | |
| download | ffmpeg-db29a7c7c2822a2f2e9804988e279a9fe7d88c11.tar.gz | |
Merge commit '9d46eaec7a90bd8f5cd9e45398c6d17804182320'
* commit '9d46eaec7a90bd8f5cd9e45398c6d17804182320':
build: The FLAC encoder also depends on the flacdsp code
img2: K&R formatting cosmetics
h264: check context state before decoding slice data partitions
flashsv: make sure data for zlib priming is available
Conflicts:
libavcodec/Makefile
libavformat/img2.c
libavformat/img2dec.c
libavformat/img2enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 14843cf24e..abed3649f9 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -3989,6 +3989,7 @@ again: if (hx->redundant_pic_count == 0 && hx->intra_gb_ptr && hx->s.data_partitioning && + s->current_picture_ptr && s->context_initialized && (avctx->skip_frame < AVDISCARD_NONREF || hx->nal_ref_idc) && (avctx->skip_frame < AVDISCARD_BIDIR || |