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

Unified Diff: source/patched-ffmpeg-mt/libavcodec/mpeg4audio.c

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 | « source/patched-ffmpeg-mt/libavcodec/libvorbis.c ('k') | source/patched-ffmpeg-mt/libavcodec/mpegaudio.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/patched-ffmpeg-mt/libavcodec/mpeg4audio.c
===================================================================
--- source/patched-ffmpeg-mt/libavcodec/mpeg4audio.c (revision 50820)
+++ source/patched-ffmpeg-mt/libavcodec/mpeg4audio.c (working copy)
@@ -131,6 +131,14 @@
get_bits1(&gb); // skip 1 bit
}
}
+
+ //PS requires SBR
+ if (!c->sbr)
+ c->ps = 0;
+ //Limit implicit PS to the HE-AACv2 Profile
+ if ((c->ps == -1 && c->object_type != AOT_AAC_LC) || c->channels & ~0x01)
+ c->ps = 0;
+
return specific_config_bitindex;
}
« no previous file with comments | « source/patched-ffmpeg-mt/libavcodec/libvorbis.c ('k') | source/patched-ffmpeg-mt/libavcodec/mpegaudio.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698