summaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorJai Menon <jmenon86@gmail.com>2009-12-05 17:51:00 +0000
committerJai Menon <jmenon86@gmail.com>2009-12-05 17:51:00 +0000
commit3394653306b773de529e779394de926588cc4096 (patch)
treea58a94da4c9b4fa3569e5b882c79462e180773dc /ffmpeg.c
parentef6fc64762a34a48aad9c070ffdf00b55dd6880e (diff)
downloadffmpeg-streaming-3394653306b773de529e779394de926588cc4096.zip
ffmpeg-streaming-3394653306b773de529e779394de926588cc4096.tar.gz
Update frame_width and frame_height based on the lowres value.
Fixes issues 1387, 1097 and probably some other lowres related problems. Originally committed as revision 20741 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index fe5d212..a87fb81 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2944,7 +2944,11 @@ static void opt_input_file(const char *filename)
frame_pix_fmt = enc->pix_fmt;
rfps = ic->streams[i]->r_frame_rate.num;
rfps_base = ic->streams[i]->r_frame_rate.den;
- if(enc->lowres) enc->flags |= CODEC_FLAG_EMU_EDGE;
+ if(enc->lowres) {
+ enc->flags |= CODEC_FLAG_EMU_EDGE;
+ frame_height >>= enc->lowres;
+ frame_width >>= enc->lowres;
+ }
if(me_threshold)
enc->debug |= FF_DEBUG_MV;
OpenPOWER on IntegriCloud