Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ffmpeg: updated gcc2 package and fixed crashes on exit.

Browse Source 
* replaced calls to free() with calls to av_free().
* updated gcc2 package to disable SSE and a few options like we had
  before with 0.6.
This commit is contained in:
Jérôme Duval 2012-03-22 01:20:06 +01:00
parent ea702bff5f
commit 5b93b4477e
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/jam/OptionalBuildFeatures
View File

@ -222,7 +222,7 @@ if $(TARGET_ARCH) = x86 {
HAIKU_LIBOGG_FILE = libogg-1.3.0-x86-gcc4-2012-03-12.zip ; HAIKU_LIBOGG_FILE = libogg-1.3.0-x86-gcc4-2012-03-12.zip ;
HAIKU_LIBVPX_FILE = libvpx-1.0.0-x86-gcc4-2012-03-14.zip ; HAIKU_LIBVPX_FILE = libvpx-1.0.0-x86-gcc4-2012-03-14.zip ;
} else { } else {
HAIKU_FFMPEG_FILE = ffmpeg-0.10-x86-gcc2-2012-03-19.zip ; HAIKU_FFMPEG_FILE = ffmpeg-0.10-x86-gcc2-2012-03-22.zip ;
HAIKU_SPEEX_FILE = speex-1.2rc1-x86-gcc2-2012-03-11.zip ; HAIKU_SPEEX_FILE = speex-1.2rc1-x86-gcc2-2012-03-11.zip ;
HAIKU_LIBTHEORA_FILE = libtheora-1.1.1-x86-gcc2-2012-03-11.zip ; HAIKU_LIBTHEORA_FILE = libtheora-1.1.1-x86-gcc2-2012-03-11.zip ;
HAIKU_LIBVORBIS_FILE = libvorbis-1.3.2-x86-gcc2-2012-03-11.zip ; HAIKU_LIBVORBIS_FILE = libvorbis-1.3.2-x86-gcc2-2012-03-11.zip ;

6
src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.cpp
View File

@ -127,9 +127,9 @@ AVCodecDecoder::~AVCodecDecoder()
if (fCodecInitDone) if (fCodecInitDone)
avcodec_close(fContext); avcodec_close(fContext);
free(fOutputPicture); av_free(fOutputPicture);
free(fInputPicture); av_free(fInputPicture);
free(fContext); av_free(fContext);
#if USE_SWS_FOR_COLOR_SPACE_CONVERSION #if USE_SWS_FOR_COLOR_SPACE_CONVERSION
if (fSwsContext != NULL) if (fSwsContext != NULL)

4
src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.cpp
View File

@ -106,10 +106,10 @@ AVCodecEncoder::~AVCodecEncoder()
fFrame->linesize[1] = 0; fFrame->linesize[1] = 0;
fFrame->linesize[2] = 0; fFrame->linesize[2] = 0;
fFrame->linesize[3] = 0; fFrame->linesize[3] = 0;
free(fFrame); av_free(fFrame);
} }
free(fOwnContext); av_free(fOwnContext);
delete[] fChunkBuffer; delete[] fChunkBuffer;
} }