[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog libmedia/ffmpeg/AudioDecoderFfm...
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] gnash ChangeLog libmedia/ffmpeg/AudioDecoderFfm... |
Date: |
Wed, 04 Jun 2008 20:12:34 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 08/06/04 20:12:33
Modified files:
. : ChangeLog
libmedia/ffmpeg: AudioDecoderFfmpeg.cpp VideoDecoderFfmpeg.cpp
Log message:
* libmedia/ffmpeg/AudioDecoderFfmpeg.cpp: don't close audio codec
context if it wasn't opened.
* libmedia/ffmpeg/VideoDecoderFfmpeg.cpp: don't close video codec
context if it wasn't opened.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6820&r2=1.6821
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp?cvsroot=gnash&r1=1.10&r2=1.11
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6820
retrieving revision 1.6821
diff -u -b -r1.6820 -r1.6821
--- ChangeLog 4 Jun 2008 19:54:11 -0000 1.6820
+++ ChangeLog 4 Jun 2008 20:12:32 -0000 1.6821
@@ -1,3 +1,10 @@
+2008-06-04 Sandro Santilli <address@hidden>
+
+ * libmedia/ffmpeg/AudioDecoderFfmpeg.cpp: don't close audio codec
+ context if it wasn't opened.
+ * libmedia/ffmpeg/VideoDecoderFfmpeg.cpp: don't close video codec
+ context if it wasn't opened.
+
2008-06-04 Benjamin Wolsey <address@hidden>
* server/movie_root.{cpp,h}: add methods to set and retrieve
Index: libmedia/ffmpeg/AudioDecoderFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- libmedia/ffmpeg/AudioDecoderFfmpeg.cpp 3 Jun 2008 12:39:53 -0000
1.4
+++ libmedia/ffmpeg/AudioDecoderFfmpeg.cpp 4 Jun 2008 20:12:33 -0000
1.5
@@ -84,7 +84,9 @@
int ret = avcodec_open(_audioCodecCtx, _audioCodec);
if (ret < 0) {
- avcodec_close(_audioCodecCtx);
+ //avcodec_close(_audioCodecCtx);
+ av_free(_audioCodecCtx);
+ _audioCodecCtx=0;
log_error(_("libavcodec failed to initialize codec"));
return false;
}
@@ -153,7 +155,9 @@
int ret = avcodec_open(_audioCodecCtx, _audioCodec);
if (ret < 0) {
- avcodec_close(_audioCodecCtx);
+ //avcodec_close(_audioCodecCtx);
+ av_free(_audioCodecCtx);
+ _audioCodecCtx = 0;
log_error(_("libavcodec failed to initialize codec"));
return false;
}
Index: libmedia/ffmpeg/VideoDecoderFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- libmedia/ffmpeg/VideoDecoderFfmpeg.cpp 3 Jun 2008 12:39:54 -0000
1.10
+++ libmedia/ffmpeg/VideoDecoderFfmpeg.cpp 4 Jun 2008 20:12:33 -0000
1.11
@@ -88,6 +88,8 @@
int ret = avcodec_open(_videoCodecCtx, _videoCodec);
if (ret < 0) {
log_error(_("libavcodec failed to initialize codec"));
+ av_free(_videoCodecCtx);
+ _videoCodecCtx=0;
return;
}
_videoCodecCtx->width = width;
- [Gnash-commit] gnash ChangeLog libmedia/ffmpeg/AudioDecoderFfm...,
Sandro Santilli <=