[SCM] libav/experimental: 10l: Include missing return values in functions made non-void by the previous commit.

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


The following commit has been merged in the experimental branch:
commit bf3d904c3df415b682266c9629ceaf1c1f7d42e2
Author: Alex Converse <alex.converse at gmail.com>
Date:   Tue Mar 9 06:21:41 2010 +0000

    10l: Include missing return values in functions made non-void by the previous commit.
    
    Originally committed as revision 22376 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/aacsbr.c b/libavcodec/aacsbr.c
index b4840fa..e00d55c 100644
--- a/libavcodec/aacsbr.c
+++ b/libavcodec/aacsbr.c
@@ -873,6 +873,8 @@ static int read_sbr_single_channel_element(AACContext *ac,
 
     if ((sbr->data[0].bs_add_harmonic_flag = get_bits1(gb)))
         get_bits1_vector(gb, sbr->data[0].bs_add_harmonic, sbr->n[1]);
+
+    return 0;
 }
 
 static int read_sbr_channel_pair_element(AACContext *ac,
@@ -913,6 +915,8 @@ static int read_sbr_channel_pair_element(AACContext *ac,
         get_bits1_vector(gb, sbr->data[0].bs_add_harmonic, sbr->n[1]);
     if ((sbr->data[1].bs_add_harmonic_flag = get_bits1(gb)))
         get_bits1_vector(gb, sbr->data[1].bs_add_harmonic, sbr->n[1]);
+
+    return 0;
 }
 
 static unsigned int read_sbr_data(AACContext *ac, SpectralBandReplication *sbr,

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list