Update ffmpeg from version r14737 to r15462.

git-svn-id: svn://localhost/HandBrake/trunk@1788 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/contrib/patch-ffmpeg-latm.patch b/contrib/patch-ffmpeg-latm.patch
index 6f7c925..5a50318 100644 (file)
--- a/contrib/patch-ffmpeg-latm.patch
+++ b/contrib/patch-ffmpeg-latm.patch
@@ -806,10 +806,8 @@ Index: libavcodec/avcodec.h
 ===================================================================
 --- libavcodec/avcodec.h       (revision 14016)
 +++ libavcodec/avcodec.h       (working copy)
-@@ -259,6 +259,7 @@
- #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
-     CODEC_ID_MPEG4AAC,
- #endif
+@@ -259,4 +259,5 @@
+     CODEC_ID_AAC,
 +    CODEC_ID_AAC_LATM,
      CODEC_ID_AC3,
      CODEC_ID_DTS,

diff --git a/contrib/version_ffmpeg.txt b/contrib/version_ffmpeg.txt
index f7a55d4..043a665 100644 (file)
--- a/contrib/version_ffmpeg.txt
+++ b/contrib/version_ffmpeg.txt
@@ -1 +1 @@
-http://download.m0k.org/handbrake/contrib/ffmpeg-r14737.tar.gz
+http://download.m0k.org/handbrake/contrib/ffmpeg-r15462.tar.gz

diff --git a/libhb/stream.c b/libhb/stream.c
index 5294919..5c8f4f4 100755 (executable)
--- a/libhb/stream.c
+++ b/libhb/stream.c
@@ -2305,7 +2305,7 @@ static void ffmpeg_add_codec( hb_stream_t *stream, int stream_index )
     // read the first packet.
     AVCodecContext *context = stream->ffmpeg_ic->streams[stream_index]->codec;
     context->workaround_bugs = FF_BUG_AUTODETECT;
-    context->error_resilience = 1;
+    context->error_recognition = 1;
     context->error_concealment = FF_EC_GUESS_MVS|FF_EC_DEBLOCK;
     AVCodec *codec = avcodec_find_decoder( context->codec_id );
     avcodec_open( context, codec );