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

Unified Diff: source/patched-ffmpeg-mt/libavformat/mpegts.c

Issue 3384002: ffmpeg source update for sep 09 (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: Created 10 years, 3 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/movenc.c ('k') | source/patched-ffmpeg-mt/libavformat/mpegvideodec.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/patched-ffmpeg-mt/libavformat/mpegts.c
===================================================================
--- source/patched-ffmpeg-mt/libavformat/mpegts.c (revision 59334)
+++ source/patched-ffmpeg-mt/libavformat/mpegts.c (working copy)
@@ -682,11 +682,15 @@
code = pes->header[3] | 0x100;
dprintf(pes->stream, "pid=%x pes_code=%#x\n", pes->pid, code);
- if ((!pes->st && pes->stream->nb_streams == MAX_STREAMS) ||
- (pes->st && pes->st->discard == AVDISCARD_ALL) ||
+ if ((pes->st && pes->st->discard == AVDISCARD_ALL) ||
code == 0x1be) /* padding_stream */
goto skip;
+#if FF_API_MAX_STREAMS
+ if (!pes->st && pes->stream->nb_streams == MAX_STREAMS)
+ goto skip;
+#endif
+
/* stream not present in PMT */
if (!pes->st) {
pes->st = av_new_stream(ts->stream, pes->pid);
« no previous file with comments | « source/patched-ffmpeg-mt/libavformat/movenc.c ('k') | source/patched-ffmpeg-mt/libavformat/mpegvideodec.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698