Unified · Split
| @@ -2294,8 +2294,6 @@ static int transcode(AVFormatContext **output_files, · 2293 unmodified lines | |||
| 2294 | ost->reformat_pair = MAKE_SFMT_PAIR(AV_SAMPLE_FMT_NONE,AV_SAMPLE_FMT_NONE); | 2294 | ost->reformat_pair = MAKE_SFMT_PAIR(AV_SAMPLE_FMT_NONE,AV_SAMPLE_FMT_NONE); |
| 2295 | if (!codec->sample_rate) { | 2295 | if (!codec->sample_rate) { |
| 2296 | codec->sample_rate = icodec->sample_rate; | 2296 | codec->sample_rate = icodec->sample_rate; |
| 2297 | if (icodec->lowres) | ||
| 2298 | codec->sample_rate >>= icodec->lowres; | ||
| 2299 | } | 2297 | } |
| 2300 | choose_sample_rate(ost->st, ost->enc); | 2298 | choose_sample_rate(ost->st, ost->enc); |
| 2301 | codec->time_base = (AVRational){1, codec->sample_rate}; | 2299 | codec->time_base = (AVRational){1, codec->sample_rate}; |
| @@ -3436,8 +3434,6 @@ static int opt_input_file(const char *opt, const char *filename) · 1134 unmodified lines | |||
| 3436 | rfps_base = ic->streams[i]->r_frame_rate.den; | 3434 | rfps_base = ic->streams[i]->r_frame_rate.den; |
| 3437 | if (dec->lowres) { | 3435 | if (dec->lowres) { |
| 3438 | dec->flags |= CODEC_FLAG_EMU_EDGE; | 3436 | dec->flags |= CODEC_FLAG_EMU_EDGE; |
| 3439 | dec->height >>= dec->lowres; | ||
| 3440 | dec->width >>= dec->lowres; | ||
| 3441 | } | 3437 | } |
| 3442 | if(me_threshold) | 3438 | if(me_threshold) |
| 3443 | dec->debug |= FF_DEBUG_MV; | 3439 | dec->debug |= FF_DEBUG_MV; |