[FFmpeg-cvslog] h264: codec reinit: remove statements without effect

Janne Grunau git at videolan.org
Sat Apr 19 19:04:08 CEST 2014


ffmpeg | branch: master | Janne Grunau <janne-libav at jannau.net> | Fri Apr 18 12:07:52 2014 +0000| [34c5a6660a9e5e3cf301691bb29d011638953dc2] | committer: Vittorio Giovara

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.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=34c5a6660a9e5e3cf301691bb29d011638953dc2
---

 libavcodec/h264_slice.c |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index 897c8eb..aed2378 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 "



More information about the ffmpeg-cvslog mailing list