ffmpeg | branch: master | Michael Niedermayer <mich...@niedermayer.cc> | Sun May 22 03:20:24 2016 +0200| [2062d51275bda642cfc72952ddef1b0efdde4c2d] | committer: Michael Niedermayer
avformat/matroskaenc: wrap par->format use as sample format under codec_type == AVMEDIA_TYPE_AUDI Fixes CID1361946 Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2062d51275bda642cfc72952ddef1b0efdde4c2d --- libavformat/matroskaenc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 4cd9878..e1e02a1 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -947,6 +947,7 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, return 0; } + if (par->codec_type == AVMEDIA_TYPE_AUDIO) { if (!bit_depth && par->codec_id != AV_CODEC_ID_ADPCM_G726) { if (par->bits_per_raw_sample) bit_depth = par->bits_per_raw_sample; @@ -955,6 +956,7 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, } if (!bit_depth) bit_depth = par->bits_per_coded_sample; + } if (par->codec_id == AV_CODEC_ID_AAC) { ret = get_aac_sample_rates(s, par, &sample_rate, &output_sample_rate); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
