aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnatoly Nenashev <nenashev_as@mail.ru>2011-01-07 10:16:00 +0000
committerCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>2011-01-07 10:16:00 +0000
commitee77f986a2f7af4ae1fb0f07d302828e08a1a2f7 (patch)
tree3e70e5270458fef6669bf8c2b1c8857b825f2199
parent65cd45a88c4a657b4ae0c81b753bb0d065a4e25a (diff)
downloadffmpeg-ee77f986a2f7af4ae1fb0f07d302828e08a1a2f7.tar.gz
Fix lowres > 0 with --enable-avfilter..
Fixes issue 2072 and issue 2421. Patch by Anatoly Nenashev, anatoly d nenashev a ovsoft d ru Originally committed as revision 26252 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--ffmpeg.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 7e2d82afd8..08a50d541b 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -3274,6 +3274,8 @@ static void opt_input_file(const char *filename)
dec->flags |= CODEC_FLAG_EMU_EDGE;
frame_height >>= dec->lowres;
frame_width >>= dec->lowres;
+ dec->height = frame_height;
+ dec->width = frame_width;
}
if(me_threshold)
dec->debug |= FF_DEBUG_MV;