Merge 76138 - Properly account the thread index on all exit paths from the fu...

README.chromium

 Contains the sources used to compile FFmpeg binaries used by Google Chrome and
 Chromium.
 
 The FFmpeg source is from Alexander Strange's ffmpeg-mt branch:
   git://gitorious.org/~astrange/ffmpeg/ffmpeg-mt.git
   Date: Friday November 6 2010
   Commit: ea396d3
   This corresponds to r25669 in the mainline ffmpeg repository.
 
 libvpx source
@@ skipping 37 matching lines @@
        patch -p1 --no-backup-if-mismatch < ../patches/ugly/13_remove_avcore.patch
        patch -p1 --no-backup-if-mismatch < ../patches/to_upstream/14_vp8_encode_options.patch
        patch -p1 --no-backup-if-mismatch < ../patches/to_upstream/15_webp_ffmpeg.patch
        patch -p1 --no-backup-if-mismatch < ../patches/to_upstream/16_neon_offsets.patch
        patch -p1 --no-backup-if-mismatch < ../patches/to_upstream/17_mpegthread.patch
        patch -p1 --no-backup-if-mismatch < ../patches/to_upstream/18_respect_swscale.patch
        patch -p1 --no-backup-if-mismatch < ../patches/from_upstream/19_vorbis_decode.patch
        patch -p1 --no-backup-if-mismatch < ../patches/from_upstream/20_r25798_ogg_data_offset.patch
        patch -p1 --no-backup-if-mismatch < ../patches/from_upstream/21_r26368_r26365_vorbis_overflow.patch
        patch -p1 --no-backup-if-mismatch < ../patches/from_upstream/22_r26366_wav_duration.patch
+       patch -p1 --no-backup-if-mismatch < ../patches/to_upstream/23_avoid_masking_matroskadec_parse_errors.patch
+       patch -p1 --no-backup-if-mismatch < ../patches/to_upstream/24_thread_index.patch
        cd ..
 
 There is also a script "make_src_tree.sh" that automates most of the steps
 above for you.  It is currently only tested on linux.
 
 NOTE: Under Windows it is recommended to use Chromium's MinGW/MSYS environment
 or 7-Zip to extract the archives.  We've experienced issues when using WinRAR.
 
 Since FFmpeg is sandboxed inside the render process, we're only interested in
 building the absolute minimum.
@@ skipping 207 matching lines @@
        diff -wurp -N orig ffmpeg-mt >patches/from_upstream/22_r26366_wav_duration.patch
 
        rm -rf orig
        cp -R ffmpeg-mt orig
        cd ffmpeg-mt
        patch -p1 --no-backup-if-mismatch < ../patches/to_upstream/23_avoid_masking_matroskadec_parse_errors.patch
        cd ..
        diff -wurp -N orig ffmpeg-mt
        diff -wurp -N orig ffmpeg-mt >patches/to_upstream/23_avoid_masking_matroskadec_parse_errors.patch
 
+       rm -rf orig
+       cp -R ffmpeg-mt orig
+       cd ffmpeg-mt
+       patch -p1 --no-backup-if-mismatch < ../patches/to_upstream/24_thread_index.patch
+       cd ..
+       diff -wurp -N orig ffmpeg-mt
+       diff -wurp -N orig ffmpeg-mt >patches/to_upstream/24_thread_index.patch
+
 Testing
   Updates should be tested against
   http://wiki.xiph.org/TheoraTestsuite
   WebKit Layout Tests
   http://www.chromium.org/developers/testing/webkit-layout-tests
     make -r test_shell BUILDTYPE=Debug
     ./src/webkit/tools/layout_tests/run_webkit_tests.sh --debug media/\*