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

Unified Diff: patched-ffmpeg-mt/libavformat/iv8.c

Issue 789004: ffmpeg roll of source to mar 9 version... (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: '' Created 10 years, 9 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
Index: patched-ffmpeg-mt/libavformat/iv8.c
===================================================================
--- patched-ffmpeg-mt/libavformat/iv8.c (revision 41250)
+++ patched-ffmpeg-mt/libavformat/iv8.c (working copy)
@@ -55,9 +55,9 @@
static int read_packet(AVFormatContext *s, AVPacket *pkt)
{
- int ret, size, pts;
-
- get_be16(s->pb); // 257
+ int ret, size, pts, type;
+retry:
+ type= get_be16(s->pb); // 257 or 258
size= get_be16(s->pb);
get_be16(s->pb); //some flags, 0x80 indicates end of frame
@@ -69,9 +69,14 @@
if(size<1)
return -1;
+ if(type==258){
+ url_fskip(s->pb, size);
+ goto retry;
+ }
+
ret= av_get_packet(s->pb, pkt, size);
- pkt->pts= pkt->dts= pts;
+ pkt->pts= pts;
pkt->pos-=16;
pkt->stream_index = 0;

Powered by Google App Engine
This is Rietveld 408576698