| Index: README.chromium
|
| ===================================================================
|
| --- README.chromium (revision 50820)
|
| +++ README.chromium (working copy)
|
| @@ -4,13 +4,13 @@
|
| The FFmpeg source is from Alexander Strange's ffmpeg-mt branch:
|
| git://gitorious.org/~astrange/ffmpeg/ffmpeg-mt.git
|
|
|
| - Date: Monday June 16 2010
|
| - Commit: febe154099b8f31817e8c047cb3c8dee51b52117
|
| - This corresponds to 23596 in the mainline ffmpeg repository.
|
| + Date: Monday June 23 2010
|
| + Commit: 7e928f69148f6c90d35715f4380accb6fc4e88c4
|
| + This corresponds to 23671 in the mainline ffmpeg repository.
|
|
|
| The libswscale source is from the public libswscale repository:
|
| git://git.ffmpeg.org/libswscale
|
| - Date: Monday June 16 2010
|
| + Date: Monday June 23 2010
|
| Commit: 0eac904069b4398edd7d57784eb56883b26ee380
|
|
|
| libvpx source
|
| @@ -27,6 +27,7 @@
|
|
|
| Steps for extracting:
|
| # 1) Extract ffmpeg-mt, which creates the directory ffmpeg-mt:
|
| + cd /cygdrive/c/src/chromium/deps/third_party/ffmpeg
|
| rm -rf ffmpeg-mt
|
| tar xf ffmpeg-mt.tar.gz
|
| # 2) Extract libswscale in place:
|
| @@ -43,8 +44,7 @@
|
| patch -p1 --no-backup-if-mismatch < ../patches/ugly/08_enforce_theora_oob.patch
|
| patch -p1 --no-backup-if-mismatch < ../patches/ugly/09_enforce_vorbis_oob_divzero.patch
|
| patch -p1 --no-backup-if-mismatch < ../patches/ugly/10_aac_oob_read.patch
|
| - patch -p1 --no-backup-if-mismatch < ../patches/to_upstream/12_vp3_key_frame_after_flush.patch
|
| - patch -p1 --no-backup-if-mismatch < ../patches/to_upstream/15_mkv_buffer_overflow.patch
|
| + patch -p1 --no-backup-if-mismatch < ../patches/to_upstream/11_mkv_buffer_overflow.patch
|
| cd ..
|
|
|
| There is also a script "make_src_tree.sh" that automates most of the steps
|
| @@ -203,16 +203,8 @@
|
| rm -rf orig
|
| cp -R ffmpeg-mt orig
|
| cd ffmpeg-mt
|
| - patch -p1 --no-backup-if-mismatch < ../patches/to_upstream/12_vp3_key_frame_after_flush.patch
|
| + patch -p1 --no-backup-if-mismatch < ../patches/to_upstream/11_mkv_buffer_overflow.patch
|
| cd ..
|
| diff -rpu -N orig ffmpeg-mt
|
| - diff -rpu -N orig ffmpeg-mt >patches/to_upstream/12_vp3_key_frame_after_flush.patch
|
| + diff -rpu -N orig ffmpeg-mt >patches/to_upstream/11_mkv_buffer_overflow.patch
|
|
|
| - rm -rf orig
|
| - cp -R ffmpeg-mt orig
|
| - cd ffmpeg-mt
|
| - patch -p1 --no-backup-if-mismatch < ../patches/to_upstream/15_mkv_buffer_overflow.patch
|
| - cd ..
|
| - diff -rpu -N orig ffmpeg-mt
|
| - diff -rpu -N orig ffmpeg-mt >patches/to_upstream/15_mkv_buffer_overflow.patch
|
| -
|
|
|