]> git.sesse.net Git - ffmpeg/commitdiff
avformat/matroskaenc: wrap par->format use as sample format under codec_type == AVMED...
authorMichael Niedermayer <michael@niedermayer.cc>
Sun, 22 May 2016 01:20:24 +0000 (03:20 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Sun, 22 May 2016 01:22:09 +0000 (03:22 +0200)
Fixes CID1361946

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavformat/matroskaenc.c

index 4cd987824b24635329f5e43497f2d9ae86399a46..e1e02a11a7552d3653469561a9ca8ee8242c3ffb 100644 (file)
@@ -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);