OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9d5894b
)
avformat/matroskaenc: wrap par->format use as sample format under codec_type == AVMED...
author
Michael Niedermayer
<michael@niedermayer.cc>
Sun, 22 May 2016 01:20:24 +0000
(
03:20
+0200)
committer
Michael 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
patch
|
blob
|
history
diff --git
a/libavformat/matroskaenc.c
b/libavformat/matroskaenc.c
index
4cd9878
..
e1e02a1
100644
(file)
--- 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);