[libav-devel] [PATCH 1/3] ffmpeg: initialise encoders earlier.

[Anton Khirnov]

Fixes choosing supported samplerate and framerate.
---
 ffmpeg.c |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index 1b31d56..600db47 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2165,6 +2165,9 @@ static int transcode(AVFormatContext **output_files,
                 abort();
             }
         } else {
+            if (!output_codecs[i])
+                output_codecs[i] = 
avcodec_find_encoder(ost->st->codec->codec_id);
+
             switch(codec->codec_type) {
             case AVMEDIA_TYPE_AUDIO:
                 ost->fifo= av_fifo_alloc(1024);
@@ -2176,7 +2179,7 @@ static int transcode(AVFormatContext **output_files,
                     if (icodec->lowres)
                         codec->sample_rate >>= icodec->lowres;
                 }
-                choose_sample_rate(ost->st, codec->codec);
+                choose_sample_rate(ost->st, output_codecs[i]);
                 codec->time_base = (AVRational){1, codec->sample_rate};
                 if (!codec->channels)
                     codec->channels = icodec->channels;
@@ -2229,9 +2232,9 @@ static int transcode(AVFormatContext **output_files,
 
                 if (!ost->frame_rate.num)
                     ost->frame_rate = ist->st->r_frame_rate.num ? 
ist->st->r_frame_rate : (AVRational){25,1};
-                if (codec->codec && codec->codec->supported_framerates && 
!force_fps) {
-                    int idx = av_find_nearest_q_idx(ost->frame_rate, 
codec->codec->supported_framerates);
-                    ost->frame_rate = codec->codec->supported_framerates[idx];
+                if (output_codecs[i] && output_codecs[i]->supported_framerates 
&& !force_fps) {
+                    int idx = av_find_nearest_q_idx(ost->frame_rate, 
output_codecs[i]->supported_framerates);
+                    ost->frame_rate = 
output_codecs[i]->supported_framerates[idx];
                 }
                 codec->time_base = (AVRational){ost->frame_rate.den, 
ost->frame_rate.num};
 
@@ -2298,8 +2301,6 @@ static int transcode(AVFormatContext **output_files,
         if (ost->encoding_needed) {
             AVCodec *codec = i < nb_output_codecs ? output_codecs[i] : NULL;
             AVCodecContext *dec = input_streams[ost->source_index].st->codec;
-            if (!codec)
-                codec = avcodec_find_encoder(ost->st->codec->codec_id);
             if (!codec) {
                 snprintf(error, sizeof(error), "Encoder (codec id %d) not 
found for output stream #%d.%d",
                          ost->st->codec->codec_id, ost->file_index, 
ost->index);
-- 
1.7.5.3

_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel