patches/to_upstream/25_ogg_index.patch - Issue 6594028: Merge 76139 - Initialize a variable, and revalidate indexes when necessary....

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/25_ogg_index.patch

Issue 6594028: Merge 76139 - Initialize a variable, and revalidate indexes when necessary.... (Closed) Base URL: svn://chrome-svn/chrome/branches/ffmpeg/648/

Patch Set: Created 9 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « README.chromium ('k') | source/patched-ffmpeg-mt/libavformat/oggdec.c » ('j') | no next file with comments »

OLD	NEW
1 diff -wurp -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 2011-02-25 03:23:22.663626821 -0800	2 --- orig/libavformat/oggdec.c 2011-02-25 03:23:22.663626821 -0800

3 +++ ffmpeg-mt/libavformat/oggdec.c 2011-02-25 07:30:11.045572658 -0800	3 +++ ffmpeg-mt/libavformat/oggdec.c 2011-02-25 07:30:11.045572658 -0800

4 @@ -610,10 +610,9 @@ ogg_read_timestamp (AVFormatContext * s,	4 @@ -610,10 +610,9 @@ ogg_read_timestamp (AVFormatContext * s,

5 int64_t pos_limit)	5 int64_t pos_limit)

6 {	6 {

7 struct ogg *ogg = s->priv_data;	7 struct ogg *ogg = s->priv_data;

8 - struct ogg_stream *os = ogg->streams + stream_index;	8 - struct ogg_stream *os = ogg->streams + stream_index;

9 ByteIOContext *bc = s->pb;	9 ByteIOContext *bc = s->pb;

10 int64_t pts = AV_NOPTS_VALUE;	10 int64_t pts = AV_NOPTS_VALUE;

(...skipping 18 matching lines...) Expand all Loading...
29 if (ret < 0)	29 if (ret < 0)

30 os->keyframe_seek = 0;	30 os->keyframe_seek = 0;

31	31

32 // Save the position seeked to.	32 // Save the position seeked to.

33 pos_arg = seek_pos = url_ftell(s->pb);	33 pos_arg = seek_pos = url_ftell(s->pb);

34 seek_pts = ogg_read_timestamp(s, stream_index, &pos_arg, url_fsize(s->pb));	34 seek_pts = ogg_read_timestamp(s, stream_index, &pos_arg, url_fsize(s->pb));

35 + os = ogg->streams + stream_index;	35 + os = ogg->streams + stream_index;

36	36

37 // Since we have seeked to the beginning then reset lastpts and lastdts to 0.	37 // Since we have seeked to the beginning then reset lastpts and lastdts to 0.

38 if (!seek_pts) {	38 if (!seek_pts) {

OLD	NEW