Index: libhb/stream.c
===================================================================
--- libhb/stream.c	(revision 1787)
+++ libhb/stream.c	(working copy)
@@ -2305,7 +2305,7 @@
     // 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 );
Index: contrib/version_ffmpeg.txt
===================================================================
--- contrib/version_ffmpeg.txt	(revision 1787)
+++ contrib/version_ffmpeg.txt	(working copy)
@@ -1 +1 @@
-http://download.m0k.org/handbrake/contrib/ffmpeg-r14737.tar.gz
+http://download.m0k.org/handbrake/contrib/ffmpeg-r15462.tar.gz
Index: contrib/patch-ffmpeg-latm.patch
===================================================================
--- contrib/patch-ffmpeg-latm.patch	(revision 1787)
+++ contrib/patch-ffmpeg-latm.patch	(working copy)
@@ -806,10 +806,8 @@
 ===================================================================
 --- 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,