patches/to_upstream/12_ogg_seek_to_zero.patch - Issue 4533003: patched ffmpeg nov 2

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 4533003: patched ffmpeg nov 2 (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/

Patch Set: '' Created 10 years, 1 month 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

OLD	NEW
1 diff -rpu -N orig/libavformat/oggdec.c ffmpeg-mt/libavformat/oggdec.c	1 diff -wurp -N orig/libavformat/oggdec.c ffmpeg-mt/libavformat/oggdec.c

2 --- orig/libavformat/oggdec.c» 2010-10-11 16:55:37 -0700	2 --- orig/libavformat/oggdec.c» 2010-11-04 08:09:13 -0700

3 +++ ffmpeg-mt/libavformat/oggdec.c» 2010-10-11 16:55:39 -0700	3 +++ ffmpeg-mt/libavformat/oggdec.c» 2010-11-04 08:09:16 -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 Loading...
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

OLD	NEW

« README.chromium ('K') | « patches/to_upstream/11_mkv_buffer_overflow.patch ('k') | patches/to_upstream/14_vp8_encode_options.patch » ('j') | no next file with comments »