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

Unified Diff: patches/to_upstream/03_mpeg4_video_to_elementary_stream.patch

Issue 2850032: ffmpeg update to june 23 version which fixes mp4 crash on still frames with 3... (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: Created 10 years, 6 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
« no previous file with comments | « patches/to_upstream/02_mov_dref_looping.patch ('k') | patches/to_upstream/04_vc1_bsfs.patch » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: patches/to_upstream/03_mpeg4_video_to_elementary_stream.patch
===================================================================
--- patches/to_upstream/03_mpeg4_video_to_elementary_stream.patch (revision 50820)
+++ patches/to_upstream/03_mpeg4_video_to_elementary_stream.patch (working copy)
@@ -1,6 +1,6 @@
diff -rpu -N orig/libavcodec/Makefile ffmpeg-mt/libavcodec/Makefile
---- orig/libavcodec/Makefile 2010-06-17 09:42:22.017734800 -0700
-+++ ffmpeg-mt/libavcodec/Makefile 2010-06-17 09:42:23.760909100 -0700
+--- orig/libavcodec/Makefile 2010-06-24 19:19:13.753895000 -0700
++++ ffmpeg-mt/libavcodec/Makefile 2010-06-24 19:19:16.327928000 -0700
@@ -586,6 +586,14 @@ OBJS-$(CONFIG_AAC_ADTSTOASC_BSF)
OBJS-$(CONFIG_CHOMP_BSF) += chomp_bsf.o
OBJS-$(CONFIG_DUMP_EXTRADATA_BSF) += dump_extradata_bsf.o
@@ -17,9 +17,9 @@
OBJS-$(CONFIG_MJPEGA_DUMP_HEADER_BSF) += mjpega_dump_header_bsf.o
OBJS-$(CONFIG_MOV2TEXTSUB_BSF) += movsub_bsf.o
diff -rpu -N orig/libavcodec/allcodecs.c ffmpeg-mt/libavcodec/allcodecs.c
---- orig/libavcodec/allcodecs.c 2010-06-17 09:42:21.673700400 -0700
-+++ ffmpeg-mt/libavcodec/allcodecs.c 2010-06-17 09:42:23.766909700 -0700
-@@ -381,6 +381,7 @@ void avcodec_register_all(void)
+--- orig/libavcodec/allcodecs.c 2010-06-24 19:19:13.176687600 -0700
++++ ffmpeg-mt/libavcodec/allcodecs.c 2010-06-24 19:19:16.327928000 -0700
+@@ -394,6 +394,7 @@ void avcodec_register_all(void)
REGISTER_BSF (CHOMP, chomp);
REGISTER_BSF (DUMP_EXTRADATA, dump_extradata);
REGISTER_BSF (H264_MP4TOANNEXB, h264_mp4toannexb);
@@ -28,8 +28,8 @@
REGISTER_BSF (MJPEGA_DUMP_HEADER, mjpega_dump_header);
REGISTER_BSF (MP3_HEADER_COMPRESS, mp3_header_compress);
diff -rpu -N orig/libavcodec/mpeg4video.h ffmpeg-mt/libavcodec/mpeg4video.h
---- orig/libavcodec/mpeg4video.h 2010-06-17 09:42:22.070740100 -0700
-+++ ffmpeg-mt/libavcodec/mpeg4video.h 2010-06-17 09:42:23.771910200 -0700
+--- orig/libavcodec/mpeg4video.h 2010-06-24 19:19:13.816295800 -0700
++++ ffmpeg-mt/libavcodec/mpeg4video.h 2010-06-24 19:19:16.343528200 -0700
@@ -91,6 +91,9 @@ void mpeg4_encode_mb(MpegEncContext *s,
void mpeg4_pred_ac(MpegEncContext * s, DCTELEM *block, int n,
int dir);
@@ -42,7 +42,7 @@
int ff_mpeg4_decode_picture_header(MpegEncContext * s, GetBitContext *gb);
diff -rpu -N orig/libavcodec/mpeg4video_es_bsf.c ffmpeg-mt/libavcodec/mpeg4video_es_bsf.c
--- orig/libavcodec/mpeg4video_es_bsf.c 1969-12-31 16:00:00.000000000 -0800
-+++ ffmpeg-mt/libavcodec/mpeg4video_es_bsf.c 2010-06-17 09:42:23.782911300 -0700
++++ ffmpeg-mt/libavcodec/mpeg4video_es_bsf.c 2010-06-24 19:19:16.343528200 -0700
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2009 Google Inc.
@@ -136,8 +136,8 @@
+ mpeg4video_es_filter,
+};
diff -rpu -N orig/libavcodec/mpeg4videoenc.c ffmpeg-mt/libavcodec/mpeg4videoenc.c
---- orig/libavcodec/mpeg4videoenc.c 2010-06-17 09:42:22.072740300 -0700
-+++ ffmpeg-mt/libavcodec/mpeg4videoenc.c 2010-06-17 09:42:23.776910700 -0700
+--- orig/libavcodec/mpeg4videoenc.c 2010-06-24 19:19:13.831896000 -0700
++++ ffmpeg-mt/libavcodec/mpeg4videoenc.c 2010-06-24 19:19:16.343528200 -0700
@@ -872,7 +872,7 @@ void ff_set_mpeg4_time(MpegEncContext *
}
}
« no previous file with comments | « patches/to_upstream/02_mov_dref_looping.patch ('k') | patches/to_upstream/04_vc1_bsfs.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698