[Gnash-commit] gnash ChangeLog server/asobj/NetStreamFfmpeg.h

[Tomas Groth]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Tomas Groth <tgc>       07/04/10 21:31:00

Modified files:
        .              : ChangeLog 
        server/asobj   : NetStreamFfmpeg.h 

Log message:
                * server/asobj/NetStreamFfmpeg.h: Fixed a bug in the 
                  AudioResampler, which made it only resample the first time.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2833&r2=1.2834
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.h?cvsroot=gnash&r1=1.20&r2=1.21

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2833
retrieving revision 1.2834
diff -u -b -r1.2833 -r1.2834
--- ChangeLog   10 Apr 2007 21:10:56 -0000      1.2833
+++ ChangeLog   10 Apr 2007 21:31:00 -0000      1.2834
@@ -1,3 +1,8 @@
+2007-04-10 Tomas Groth Christensen <address@hidden>
+
+       * server/asobj/NetStreamFfmpeg.h: Fixed a bug in the 
+         AudioResampler, which made it only resample the first time.
+
 2007-04-10 Markus Gothe <address@hidden>
 
        * cygnal/http.cpp cygnal/stream.cpp: Added 'return true'-stubs, closes

Index: server/asobj/NetStreamFfmpeg.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- server/asobj/NetStreamFfmpeg.h      10 Apr 2007 20:24:23 -0000      1.20
+++ server/asobj/NetStreamFfmpeg.h      10 Apr 2007 21:31:00 -0000      1.21
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: NetStreamFfmpeg.h,v 1.20 2007/04/10 20:24:23 bjacques Exp $ */
+/* $Id: NetStreamFfmpeg.h,v 1.21 2007/04/10 21:31:00 tgc Exp $ */
 
 #ifndef __NETSTREAMFFMPEG_H__
 #define __NETSTREAMFFMPEG_H__
@@ -152,9 +152,11 @@
        
        bool init(AVCodecContext* ctx)
        {
-               if (!_context && (ctx->sample_rate != 44100 && ctx->channels != 
2)) {
+               if (ctx->sample_rate != 44100 && ctx->channels != 2) {
+                       if (!_context) {
                        _context = audio_resample_init(2,  ctx->channels,
                                44100, ctx->sample_rate);
+                       }
                        return true;
                }
                return false;