x264 bump from r1698 to r1703

[handbrake-jp/handbrake-jp-git.git] / contrib / ffmpeg / A01-mpegleak.patch

diff --git a/contrib/ffmpeg/A01-mpegleak.patch b/contrib/ffmpeg/A01-mpegleak.patch
index 36179ba..49e9945 100644 (file)
--- a/contrib/ffmpeg/A01-mpegleak.patch
+++ b/contrib/ffmpeg/A01-mpegleak.patch
@@ -1,28 +1,8 @@
-diff -Naur ffmpeg.orig/libavcodec/h264.c ffmpeg/libavcodec/h264.c
---- ffmpeg.orig/libavcodec/h264.c      2008-12-01 11:24:19.000000000 -0500
-+++ ffmpeg/libavcodec/h264.c   2009-02-21 08:23:58.000000000 -0500
-@@ -3298,7 +3298,7 @@
-          * stream. Need to discard one frame. Prevents overrun of the
-          * short_ref and long_ref buffers.
-          */
--        av_log(h->s.avctx, AV_LOG_ERROR,
-+        av_log(h->s.avctx, AV_LOG_DEBUG,
-                "number of reference frames exceeds max (probably "
-                "corrupt input), discarding one\n");
- 
-@@ -7556,7 +7556,7 @@
- 
-     if(!(s->flags2 & CODEC_FLAG2_CHUNKS) && !s->current_picture_ptr){
-         if (avctx->skip_frame >= AVDISCARD_NONREF || s->hurry_up) return 0;
--        av_log(avctx, AV_LOG_ERROR, "no frame!\n");
-+        av_log(avctx, AV_LOG_DEBUG, "no frame!\n");
-         return -1;
-     }
- 
-diff -Naur ffmpeg.orig/libavcodec/mpegvideo.c ffmpeg/libavcodec/mpegvideo.c
---- ffmpeg.orig/libavcodec/mpegvideo.c 2008-10-01 20:27:09.000000000 -0400
-+++ ffmpeg/libavcodec/mpegvideo.c      2009-02-21 08:23:58.000000000 -0500
-@@ -779,19 +779,18 @@
+Index: libavcodec/mpegvideo.c
+===================================================================
+--- ffmpeg.orig/libavcodec/mpegvideo.c (revision 22823)
++++ ffmpeg/libavcodec/mpegvideo.c      (working copy)
+@@ -867,19 +867,18 @@
      }
  
      av_log(s->avctx, AV_LOG_FATAL, "Internal error, picture buffer overflow\n");
@@ -54,3 +34,29 @@ diff -Naur ffmpeg.orig/libavcodec/mpegvideo.c ffmpeg/libavcodec/mpegvideo.c
  }
  
  static void update_noise_reduction(MpegEncContext *s){
+Index: libavcodec/h264.c
+===================================================================
+--- ffmpeg.orig/libavcodec/h264.c      (revision 22823)
++++ ffmpeg/libavcodec/h264.c   (working copy)
+@@ -2772,7 +2772,7 @@
+ 
+     if(!(s->flags2 & CODEC_FLAG2_CHUNKS) && !s->current_picture_ptr){
+         if (avctx->skip_frame >= AVDISCARD_NONREF || s->hurry_up) return 0;
+-        av_log(avctx, AV_LOG_ERROR, "no frame!\n");
++        av_log(avctx, AV_LOG_DEBUG, "no frame!\n");
+         return -1;
+     }
+ 
+Index: libavcodec/h264_refs.c
+===================================================================
+--- ffmpeg.orig/libavcodec/h264_refs.c (revision 22823)
++++ ffmpeg/libavcodec/h264_refs.c      (working copy)
+@@ -608,7 +608,7 @@
+          * stream. Need to discard one frame. Prevents overrun of the
+          * short_ref and long_ref buffers.
+          */
+-        av_log(h->s.avctx, AV_LOG_ERROR,
++        av_log(h->s.avctx, AV_LOG_DEBUG,
+                "number of reference frames exceeds max (probably "
+                "corrupt input), discarding one\n");
+