summaryrefslogtreecommitdiff
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-07-14 21:22:12 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-07-14 21:22:12 +0200
commit321b2a9ded0468670b7678b7c098886930ae16b2 (patch)
treecb3995f36391a5266fc5343cbd6c7e50fa42d87a /ffmpeg.c
parent5dc6bd86f0f5cfffb44b47e6e916119f26b12091 (diff)
ffmpeg: loose lowres hackery
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 42c82a0b8a..b73d60a835 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2294,8 +2294,6 @@ static int transcode(AVFormatContext **output_files,
ost->reformat_pair = MAKE_SFMT_PAIR(AV_SAMPLE_FMT_NONE,AV_SAMPLE_FMT_NONE);
if (!codec->sample_rate) {
codec->sample_rate = icodec->sample_rate;
- if (icodec->lowres)
- codec->sample_rate >>= icodec->lowres;
}
choose_sample_rate(ost->st, ost->enc);
codec->time_base = (AVRational){1, codec->sample_rate};
@@ -3436,8 +3434,6 @@ static int opt_input_file(const char *opt, const char *filename)
rfps_base = ic->streams[i]->r_frame_rate.den;
if (dec->lowres) {
dec->flags |= CODEC_FLAG_EMU_EDGE;
- dec->height >>= dec->lowres;
- dec->width >>= dec->lowres;
}
if(me_threshold)
dec->debug |= FF_DEBUG_MV;