x264 bump to r1101

[handbrake-jp/handbrake-jp-git.git] / contrib / patch-ffmpeg-latm.patch

diff --git a/contrib/patch-ffmpeg-latm.patch b/contrib/patch-ffmpeg-latm.patch
index 6f7c925..84cd6a8 100644 (file)
--- a/contrib/patch-ffmpeg-latm.patch
+++ b/contrib/patch-ffmpeg-latm.patch
@@ -11,10 +11,10 @@ Index: libavcodec/Makefile
  OBJS-$(CONFIG_LIBGSM)                  += libgsm.o
  OBJS-$(CONFIG_LIBMP3LAME)              += libmp3lame.o
  OBJS-$(CONFIG_LIBSCHROEDINGER_DECODER) += libschroedingerdec.o libschroedinger.o libdirac_libschro.o
-@@ -333,7 +333,7 @@
+@@ -350,7 +350,7 @@
  OBJS-$(CONFIG_LIBXVID)                 += libxvidff.o libxvid_rc.o
  
- 
+ # parsers
 -OBJS-$(CONFIG_AAC_PARSER)              += aac_parser.o aac_ac3_parser.o mpeg4audio.o
 +OBJS-$(CONFIG_AAC_PARSER)              += aac_parser.o aac_ac3_parser.o mpeg4audio.o latm_parser.o
  OBJS-$(CONFIG_AC3_PARSER)              += ac3_parser.o ac3tab.o aac_ac3_parser.o
@@ -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,