diff options
| author | Janne Grunau <janne-libav@jannau.net> | 2014-04-18 12:07:52 +0000 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2014-04-19 16:22:06 +0200 |
| commit | 34c5a6660a9e5e3cf301691bb29d011638953dc2 (patch) | |
| tree | 0fcda3a45362d9527f85164402b4af6fb9cce405 | |
| parent | 6ef96292d99302a59f824713fc763f6abd3754df (diff) | |
| download | ffmpeg-34c5a6660a9e5e3cf301691bb29d011638953dc2.tar.gz | |
h264: codec reinit: remove statements without effect
avctx->coded_{height,width} will always equal h->{height,width} since
init_dimensions() does that explicitly, Size changes are detected by
changes in mb_{height,width} earlier and propagated through the
needs_reinit variable.
| -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 897c8ebdbb..aed2378f28 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1306,10 +1306,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 || - needs_reinit)) { + if (h->context_initialized && needs_reinit) { if (h != h0) { av_log(h->avctx, AV_LOG_ERROR, "changing width %d -> %d / height %d -> %d on " |