Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(146)

Unified Diff: chromium/patches/to_upstream/54_mov_stss.patch

Issue 9370003: Remove pthreads patch, roll in new patches, disable unchecked bit readers. (Closed) Base URL: ssh://gerrit.chromium.org:29418/chromium/third_party/ffmpeg.git@master
Patch Set: gyp fix. Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chromium/patches/to_upstream/54_mov_stss.patch
diff --git a/chromium/patches/to_upstream/54_mov_stss.patch b/chromium/patches/to_upstream/54_mov_stss.patch
new file mode 100644
index 0000000000000000000000000000000000000000..1325b483064ddfd0a7f5a9c476751abd47f511db
--- /dev/null
+++ b/chromium/patches/to_upstream/54_mov_stss.patch
@@ -0,0 +1,12 @@
+diff -wurp -N orig/libavformat/mov.c ffmpeg/libavformat/mov.c
+--- orig/libavformat/mov.c 2012-02-03 11:39:21.961119253 -0800
++++ ffmpeg/libavformat/mov.c 2012-02-03 11:39:56.500485313 -0800
+@@ -1558,7 +1558,7 @@ static void mov_build_index(MOVContext *
+ unsigned int stts_sample = 0;
+ unsigned int sample_size;
+ unsigned int distance = 0;
+- int key_off = sc->keyframes && sc->keyframes[0] == 1;
++ int key_off = sc->keyframe_count && sc->keyframes[0] == 1;
+
+ current_dts -= sc->dts_shift;
+

Powered by Google App Engine
This is Rietveld 408576698