RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
This commit is contained in:
Janne Grunau 2014-04-18 12:07:52 +00:00 committed by Vittorio Giovara
parent 6ef96292d9
commit 34c5a6660a
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/h264_slice.c
View File

@ -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 "