Commit 321b2a9d authored by Michael Niedermayer's avatar Michael Niedermayer

ffmpeg: loose lowres hackery

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 5dc6bd86
...@@ -2294,8 +2294,6 @@ static int transcode(AVFormatContext **output_files, ...@@ -2294,8 +2294,6 @@ static int transcode(AVFormatContext **output_files,
ost->reformat_pair = MAKE_SFMT_PAIR(AV_SAMPLE_FMT_NONE,AV_SAMPLE_FMT_NONE); ost->reformat_pair = MAKE_SFMT_PAIR(AV_SAMPLE_FMT_NONE,AV_SAMPLE_FMT_NONE);
if (!codec->sample_rate) { if (!codec->sample_rate) {
codec->sample_rate = icodec->sample_rate; codec->sample_rate = icodec->sample_rate;
if (icodec->lowres)
codec->sample_rate >>= icodec->lowres;
} }
choose_sample_rate(ost->st, ost->enc); choose_sample_rate(ost->st, ost->enc);
codec->time_base = (AVRational){1, codec->sample_rate}; codec->time_base = (AVRational){1, codec->sample_rate};
...@@ -3436,8 +3434,6 @@ static int opt_input_file(const char *opt, const char *filename) ...@@ -3436,8 +3434,6 @@ static int opt_input_file(const char *opt, const char *filename)
rfps_base = ic->streams[i]->r_frame_rate.den; rfps_base = ic->streams[i]->r_frame_rate.den;
if (dec->lowres) { if (dec->lowres) {
dec->flags |= CODEC_FLAG_EMU_EDGE; dec->flags |= CODEC_FLAG_EMU_EDGE;
dec->height >>= dec->lowres;
dec->width >>= dec->lowres;
} }
if(me_threshold) if(me_threshold)
dec->debug |= FF_DEBUG_MV; dec->debug |= FF_DEBUG_MV;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment