It's broken with multiple files or audio streams.
---
ffmpeg.c | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ffmpeg.c b/ffmpeg.c
index 52362b0..54dfc68 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2178,6 +2178,9 @@ static int transcode(AVFormatContext **output_files,
}
choose_sample_rate(ost->st, ost->enc);
codec->time_base = (AVRational){1, codec->sample_rate};
+ if (codec->sample_fmt == AV_SAMPLE_FMT_NONE)
+ codec->sample_fmt = icodec->sample_fmt;
+ choose_sample_fmt(ost->st, ost->enc);
if (!codec->channels)
codec->channels = icodec->channels;
codec->channel_layout = icodec->channel_layout;
@@ -3304,7 +3307,6 @@ static int opt_input_file(const char *opt, const char
*filename)
case AVMEDIA_TYPE_AUDIO:
ist->dec = avcodec_find_decoder_by_name(audio_codec_name);
set_context_opts(dec, avcodec_opts[AVMEDIA_TYPE_AUDIO],
AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_DECODING_PARAM, ist->dec);
- audio_sample_fmt = dec->sample_fmt;
if(audio_disable)
st->discard= AVDISCARD_ALL;
break;
@@ -3365,6 +3367,7 @@ static int opt_input_file(const char *opt, const char
*filename)
frame_width = 0;
audio_sample_rate = 0;
audio_channels = 0;
+ audio_sample_fmt = AV_SAMPLE_FMT_NONE;
av_freep(&video_codec_name);
av_freep(&audio_codec_name);
@@ -3595,10 +3598,10 @@ static void new_audio_stream(AVFormatContext *oc, int
file_idx)
}
if (audio_channels)
audio_enc->channels = audio_channels;
- audio_enc->sample_fmt = audio_sample_fmt;
+ if (audio_sample_fmt != AV_SAMPLE_FMT_NONE)
+ audio_enc->sample_fmt = audio_sample_fmt;
if (audio_sample_rate)
audio_enc->sample_rate = audio_sample_rate;
- choose_sample_fmt(ost->st, codec);
}
if (audio_language) {
av_dict_set(&ost->st->metadata, "language", audio_language, 0);
@@ -3865,6 +3868,7 @@ static void opt_output_file(const char *filename)
frame_height = 0;
audio_sample_rate = 0;
audio_channels = 0;
+ audio_sample_fmt = AV_SAMPLE_FMT_NONE;
av_freep(&forced_key_frames);
uninit_opts();
--
1.7.5.3
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
