[SCM] libav/experimental: Factorize code in get_bit_rate().

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:06:06 UTC 2013


The following commit has been merged in the experimental branch:
commit 4563cf247dfbe45ffe49f11dd97556ed4a8b2c1e
Author: Stefano Sabatini <stefano.sabatini-lala at poste.it>
Date:   Tue Apr 13 23:24:25 2010 +0000

    Factorize code in get_bit_rate().
    
    Originally committed as revision 22879 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 8b4b363..fd6dc07 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -781,21 +781,15 @@ static int get_bit_rate(AVCodecContext *ctx)
 
     switch(ctx->codec_type) {
     case AVMEDIA_TYPE_VIDEO:
+    case AVMEDIA_TYPE_DATA:
+    case AVMEDIA_TYPE_SUBTITLE:
+    case AVMEDIA_TYPE_ATTACHMENT:
         bit_rate = ctx->bit_rate;
         break;
     case AVMEDIA_TYPE_AUDIO:
         bits_per_sample = av_get_bits_per_sample(ctx->codec_id);
         bit_rate = bits_per_sample ? ctx->sample_rate * ctx->channels * bits_per_sample : ctx->bit_rate;
         break;
-    case AVMEDIA_TYPE_DATA:
-        bit_rate = ctx->bit_rate;
-        break;
-    case AVMEDIA_TYPE_SUBTITLE:
-        bit_rate = ctx->bit_rate;
-        break;
-    case AVMEDIA_TYPE_ATTACHMENT:
-        bit_rate = ctx->bit_rate;
-        break;
     default:
         bit_rate = 0;
         break;

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list