[FFmpeg-soc] [soc]: r394 - matroska/matroskaenc.c

[conrad]

Author: conrad
Date: Fri Jul 13 23:37:14 2007
New Revision: 394

Log:
Use av_get_bits_per_sample

Modified:
   matroska/matroskaenc.c

Modified: matroska/matroskaenc.c
==============================================================================
--- matroska/matroskaenc.c	(original)
+++ matroska/matroskaenc.c	Fri Jul 13 23:37:14 2007
@@ -366,7 +366,7 @@ static int mkv_write_tracks(AVFormatCont
         AVCodecContext *codec = st->codec;
         offset_t subinfo, track;
         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);
         put_ebml_uint (pb, MATROSKA_ID_TRACKNUMBER     , i + 1);
@@ -385,19 +385,6 @@ static int mkv_write_tracks(AVFormatCont
             }
         }
 
-        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, ...
         if (native_id) {
             if (codec->codec_id == CODEC_ID_VORBIS || codec->codec_id == CODEC_ID_THEORA) {