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

Side by Side Diff: patches/to_upstream/12_ogg_seek_to_zero.patch

Issue 3066011: ffmpeg configured with webm decode only to avoid postproc that pulls in unuse... (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: '' Created 10 years, 4 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 unified diff | Download patch | Annotate | Revision Log
Property Changes:
Added: svn:eol-style
+ LF
OLDNEW
1 diff -rpu -N orig/libavformat/oggdec.c ffmpeg-mt/libavformat/oggdec.c 1 diff -rpu -N orig/libavformat/oggdec.c ffmpeg-mt/libavformat/oggdec.c
2 --- orig/libavformat/oggdec.c» 2010-07-27 13:09:59.407714100 -0700 2 --- orig/libavformat/oggdec.c» 2010-07-28 15:25:20.964333700 -0700
3 +++ ffmpeg-mt/libavformat/oggdec.c» 2010-07-27 13:13:20.641835500 -0700 3 +++ ffmpeg-mt/libavformat/oggdec.c» 2010-07-28 15:25:22.024439700 -0700
4 @@ -596,6 +596,8 @@ ogg_read_timestamp (AVFormatContext * s, 4 @@ -596,6 +596,8 @@ ogg_read_timestamp (AVFormatContext * s,
5 ByteIOContext *bc = s->pb; 5 ByteIOContext *bc = s->pb;
6 int64_t pts = AV_NOPTS_VALUE; 6 int64_t pts = AV_NOPTS_VALUE;
7 int i; 7 int i;
8 + int packet = 0; 8 + int packet = 0;
9 + int64_t start_pos = *pos_arg; 9 + int64_t start_pos = *pos_arg;
10 url_fseek(bc, *pos_arg, SEEK_SET); 10 url_fseek(bc, *pos_arg, SEEK_SET);
11 ogg_reset(ogg); 11 ogg_reset(ogg);
12 12
13 @@ -604,6 +606,12 @@ ogg_read_timestamp (AVFormatContext * s, 13 @@ -604,6 +606,12 @@ ogg_read_timestamp (AVFormatContext * s,
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 + struct ogg_stream *stream = ogg->streams + i; 49 + struct ogg_stream *stream = ogg->streams + i;
50 + stream->lastpts = 0; 50 + stream->lastpts = 0;
51 + stream->lastdts = 0; 51 + stream->lastdts = 0;
52 + } 52 + }
53 + os->keyframe_seek = 0; 53 + os->keyframe_seek = 0;
54 + } 54 + }
55 + url_fseek(s->pb, seek_pos, SEEK_SET); 55 + url_fseek(s->pb, seek_pos, SEEK_SET);
56 return ret; 56 return ret;
57 } 57 }
58 58
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698