eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-17 12:30:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use av_get_bits_per_sample

Browse Source 
Originally committed as revision 10323 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
David Conrad
2007-09-05 00:23:34 +00:00
parent 44008871ef
commit d22f88cb19
1 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libavformat/matroskaenc.c
View File

@@ -366,7 +366,7 @@ static int mkv_write_tracks(AVFormatContext *s)
AVCodecContext *codec = st->codec; AVCodecContext *codec = st->codec;
offset_t subinfo, track; offset_t subinfo, track;
int native_id = 0; int native_id = 0;
int bit_depth = 0; int bit_depth = av_get_bits_per_sample(codec->codec_id);
track = start_ebml_master(pb, MATROSKA_ID_TRACKENTRY); track = start_ebml_master(pb, MATROSKA_ID_TRACKENTRY);
put_ebml_uint (pb, MATROSKA_ID_TRACKNUMBER , i + 1); put_ebml_uint (pb, MATROSKA_ID_TRACKNUMBER , i + 1);
@@ -385,19 +385,6 @@ static int mkv_write_tracks(AVFormatContext *s)
} }
} }
switch (codec->codec_id) {
case CODEC_ID_PCM_S16LE:
case CODEC_ID_PCM_S16BE:
case CODEC_ID_PCM_U16LE:
case CODEC_ID_PCM_U16BE:
bit_depth = 16;
break;
case CODEC_ID_PCM_S8:
case CODEC_ID_PCM_U8:
bit_depth = 8;
break;
}
// XXX: CodecPrivate for vorbis, theora, aac, native mpeg4, ... // XXX: CodecPrivate for vorbis, theora, aac, native mpeg4, ...
if (native_id) { if (native_id) {
if (codec->codec_id == CODEC_ID_VORBIS || codec->codec_id == CODEC_ID_THEORA) { if (codec->codec_id == CODEC_ID_VORBIS || codec->codec_id == CODEC_ID_THEORA) {