[SCM] libav/experimental: Remove unneeded wrapper function.

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


The following commit has been merged in the experimental branch:
commit 43b3273e5b2ab022f068d758fdaba90aee790fbf
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date:   Sat Jul 31 16:50:27 2010 +0000

    Remove unneeded wrapper function.
    
    Originally committed as revision 24622 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/flacenc.c b/libavcodec/flacenc.c
index 487d023..afaa0c3 100644
--- a/libavcodec/flacenc.c
+++ b/libavcodec/flacenc.c
@@ -632,13 +632,6 @@ static uint32_t calc_rice_params_lpc(RiceContext *rc, int pmin, int pmax,
 }
 
 
-static void encode_residual_verbatim(int32_t *res, int32_t *smp, int n)
-{
-    assert(n > 0);
-    memcpy(res, smp, n * sizeof(int32_t));
-}
-
-
 static void encode_residual_fixed(int32_t *res, const int32_t *smp, int n,
                                   int order)
 {
@@ -824,7 +817,7 @@ static int encode_residual_ch(FlacEncodeContext *s, int ch)
     /* VERBATIM */
     if (frame->verbatim_only || n < 5) {
         sub->type = sub->type_code = FLAC_SUBFRAME_VERBATIM;
-        encode_residual_verbatim(res, smp, n);
+        memcpy(res, smp, n * sizeof(int32_t));
         return sub->obits * n;
     }
 

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list