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

Unified Diff: patches/ugly/10_aac_oob_read.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/ugly/09_enforce_vorbis_oob_divzero.patch ('k') | source/patched-ffmpeg-mt/Changelog » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: patches/ugly/10_aac_oob_read.patch
===================================================================
--- patches/ugly/10_aac_oob_read.patch (revision 50820)
+++ patches/ugly/10_aac_oob_read.patch (working copy)
@@ -1,7 +1,7 @@
diff -rpu -N orig/libavcodec/aacdec.c ffmpeg-mt/libavcodec/aacdec.c
---- orig/libavcodec/aacdec.c 2010-06-17 09:40:00.951629600 -0700
-+++ ffmpeg-mt/libavcodec/aacdec.c 2010-06-17 09:40:03.849919400 -0700
-@@ -464,6 +464,7 @@ static int decode_audio_specific_config(
+--- orig/libavcodec/aacdec.c 2010-06-24 19:19:57.840060200 -0700
++++ ffmpeg-mt/libavcodec/aacdec.c 2010-06-24 19:20:02.098914800 -0700
+@@ -466,6 +466,7 @@ static int decode_audio_specific_config(
int i;
init_get_bits(&gb, data, data_size * 8);
@@ -9,7 +9,7 @@
if ((i = ff_mpeg4audio_get_config(&ac->m4ac, data, data_size)) < 0)
return -1;
-@@ -1979,6 +1980,7 @@ static int aac_decode_frame(AVCodecConte
+@@ -1989,6 +1990,7 @@ static int aac_decode_frame(AVCodecConte
int buf_offset;
init_get_bits(&gb, buf, buf_size * 8);
@@ -17,7 +17,7 @@
if (show_bits(&gb, 12) == 0xfff) {
if (parse_adts_frame_header(ac, &gb) < 0) {
-@@ -1994,6 +1996,12 @@ static int aac_decode_frame(AVCodecConte
+@@ -2004,6 +2006,12 @@ static int aac_decode_frame(AVCodecConte
memset(ac->tags_seen_this_frame, 0, sizeof(ac->tags_seen_this_frame));
// parse
while ((elem_type = get_bits(&gb, 3)) != TYPE_END) {
« no previous file with comments | « patches/ugly/09_enforce_vorbis_oob_divzero.patch ('k') | source/patched-ffmpeg-mt/Changelog » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698