diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-19 18:50:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-19 18:50:32 +0200 |
| commit | 928b5708f94c50e8cb0b982208a2d097b0d588c2 (patch) | |
| tree | 142af652040c8eed9368fd54196798f4d5889626 /libavcodec/h264_slice.c | |
| parent | c1bc20bfd9f6ab2d2a3342a924938185404d7a4f (diff) | |
| parent | 34c5a6660a9e5e3cf301691bb29d011638953dc2 (diff) | |
| download | ffmpeg-928b5708f94c50e8cb0b982208a2d097b0d588c2.tar.gz | |
Merge commit '34c5a6660a9e5e3cf301691bb29d011638953dc2'
* commit '34c5a6660a9e5e3cf301691bb29d011638953dc2':
h264: codec reinit: remove statements without effect
Conflicts:
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_slice.c')
| -rw-r--r-- | libavcodec/h264_slice.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 17557d1538..1234168a1f 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1420,10 +1420,7 @@ int ff_h264_decode_slice_header(H264Context *h, H264Context *h0) } if (h->context_initialized && - (h->width != h->avctx->coded_width || - h->height != h->avctx->coded_height || - must_reinit || - needs_reinit)) { + (must_reinit || needs_reinit)) { if (h != h0) { av_log(h->avctx, AV_LOG_ERROR, "changing width %d -> %d / height %d -> %d on " |