X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=contrib%2Fpatch-ffmpeg.patch;h=e52731f1d7dfd69ca295339d255a3969b4655070;hb=b503190ecc40bb4eeed504213aa90b3a65e244c7;hp=c653641382784b381fc561389753a6457b81d8db;hpb=f54d44ee1632ffa7f1a6b153a06a529f0476004d;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/contrib/patch-ffmpeg.patch b/contrib/patch-ffmpeg.patch
index c6536413..e52731f1 100644
--- a/contrib/patch-ffmpeg.patch
+++ b/contrib/patch-ffmpeg.patch
@@ -1,86 +1,8 @@
-diff -ru ffmpeg-20060326-bak/configure ffmpeg-20060326/configure
---- ffmpeg-20060326-bak/configure	2006-03-26 22:04:53.000000000 +0200
-+++ ffmpeg-20060326/configure	2006-04-26 16:48:00.000000000 +0200
-@@ -272,7 +272,7 @@
- 2.9-beos-991026*|2.9-beos-000224*) echo "R5/GG gcc"
- mmx="no"
- ;;
--*20010315*) echo "BeBits gcc"
-+*20010315*|2.95.3*) echo "BeBits gcc"
- CFLAGS="$CFLAGS -fno-expensive-optimizations"
- ;;
- esac
-diff -ru ffmpeg-20060326-bak/libavformat/movenc.c ffmpeg-20060326/libavformat/movenc.c
---- ffmpeg-20060326-bak/libavformat/movenc.c	2006-03-26 22:04:53.000000000 +0200
-+++ ffmpeg-20060326/libavformat/movenc.c	2006-04-26 16:48:54.000000000 +0200
-@@ -22,6 +22,10 @@
- #include "avio.h"
- #include "mov.h"
- 
-+#ifndef UINT32_MAX
-+#define UINT32_MAX (4294967295U)
-+#endif
-+
- #undef NDEBUG
- #include <assert.h>
- 
-@@ -435,11 +439,6 @@
-             end = track->vosData + track->vosLen;
- 
-             put_byte(pb, 1); /* version */
--            put_byte(pb, 77); /* profile */
--            put_byte(pb, 64); /* profile compat */
--            put_byte(pb, 30); /* level */
--            put_byte(pb, 0xff); /* 6 bits reserved (111111) + 2 bits nal size length - 1 (11) */
--            put_byte(pb, 0xe1); /* 3 bits reserved (111) + 5 bits number of sps (00001) */
- 
-             /* look for sps and pps */
-             while (buf < end) {
-@@ -458,6 +457,12 @@
-             }
-             assert(sps);
-             assert(pps);
-+
-+            put_byte(pb, sps[1]); /* profile */
-+            put_byte(pb, sps[2]); /* profile compat */
-+            put_byte(pb, sps[3]); /* level */
-+            put_byte(pb, 0xff); /* 6 bits reserved (111111) + 2 bits nal size length - 1 (11) */
-+            put_byte(pb, 0xe1); /* 3 bits reserved (111) + 5 bits number of sps (00001) */
-             put_be16(pb, sps_size);
-             put_buffer(pb, sps, sps_size);
-             put_byte(pb, 1); /* number of pps */
-@@ -621,6 +626,18 @@
-     return tag;
- }
- 
-+static int mov_write_colr_tag(ByteIOContext *pb)
-+{
-+    put_be32( pb, 0x12 );
-+    put_tag( pb, "colr" );
-+    put_tag( pb, "nclc" );
-+    put_be16( pb, 6 );
-+    put_be16( pb, 1 );
-+    put_be16( pb, 6 );
-+    put_be32( pb, 0 );
-+    return 0x12;
-+}
-+
- static int mov_write_video_tag(ByteIOContext *pb, MOVTrack* track)
- {
-     offset_t pos = url_ftell(pb);
-@@ -670,6 +687,8 @@
-     else if(track->enc->codec_id == CODEC_ID_H264)
-         mov_write_avcc_tag(pb, track);
- 
-+    mov_write_colr_tag(pb);
-+
-     return updateSize (pb, pos);
- }
- 
-diff -ru ffmpeg-20060326-bak/libavformat/tcp.c ffmpeg-20060326/libavformat/tcp.c
---- ffmpeg-20060326-bak/libavformat/tcp.c	2006-03-26 22:04:53.000000000 +0200
-+++ ffmpeg-20060326/libavformat/tcp.c	2006-04-26 16:48:00.000000000 +0200
-@@ -112,11 +112,13 @@
+Index: libavformat/tcp.c
+===================================================================
+--- libavformat/tcp.c	(revision 9814)
++++ libavformat/tcp.c	(working copy)
+@@ -88,11 +88,13 @@
                  break;
          }