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

Unified Diff: source/patched-ffmpeg-mt/libavformat/matroskadec.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/libavformat/isom.c ('k') | source/patched-ffmpeg-mt/libavformat/mmst.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/patched-ffmpeg-mt/libavformat/matroskadec.c
===================================================================
--- source/patched-ffmpeg-mt/libavformat/matroskadec.c (revision 50820)
+++ source/patched-ffmpeg-mt/libavformat/matroskadec.c (working copy)
@@ -1169,7 +1169,7 @@
uint64_t max_start = 0;
Ebml ebml = { 0 };
AVStream *st;
- int i, j;
+ int i, j, res;
matroska->ctx = s;
@@ -1194,8 +1194,8 @@
ebml_free(ebml_syntax, &ebml);
/* The next thing is a segment. */
- if (ebml_parse(matroska, matroska_segments, matroska) < 0)
- return -1;
+ if ((res = ebml_parse(matroska, matroska_segments, matroska)) < 0)
+ return res;
matroska_execute_seekhead(matroska);
if (!matroska->time_scale)
« no previous file with comments | « source/patched-ffmpeg-mt/libavformat/isom.c ('k') | source/patched-ffmpeg-mt/libavformat/mmst.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698