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

Side by Side Diff: patches/to_upstream/24_ogg_index.patch

Issue 6598004: Initialize a variable, and revalidate indexes when necessary.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: Created 9 years, 10 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
OLDNEW
(Empty)
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
3 +++ ffmpeg-mt/libavformat/oggdec.c 2011-02-25 07:30:11.045572658 -0800
4 @@ -610,10 +610,9 @@ ogg_read_timestamp (AVFormatContext * s,
5 int64_t pos_limit)
6 {
7 struct ogg *ogg = s->priv_data;
8 - struct ogg_stream *os = ogg->streams + stream_index;
9 ByteIOContext *bc = s->pb;
10 int64_t pts = AV_NOPTS_VALUE;
11 - int i;
12 + int i = -1;
13 int packet = 0;
14 int64_t start_pos = *pos_arg;
15 url_fseek(bc, *pos_arg, SEEK_SET);
16 @@ -621,6 +620,7 @@ ogg_read_timestamp (AVFormatContext * s,
17
18 while (url_ftell(bc) < pos_limit && !ogg_packet(s, &i, NULL, NULL, pos_arg) ) {
19 if (i == stream_index) {
20 + struct ogg_stream *os = ogg->streams + stream_index;
21 pts = ogg_calc_pts(s, i, NULL);
22 if (os->keyframe_seek && !(os->pflags & AV_PKT_FLAG_KEY))
23 pts = AV_NOPTS_VALUE;
24 @@ -655,12 +655,14 @@ static int ogg_read_seek(AVFormatContext
25 os->keyframe_seek = 1;
26
27 ret = av_seek_frame_binary(s, stream_index, timestamp, flags);
28 + os = ogg->streams + stream_index;
29 if (ret < 0)
30 os->keyframe_seek = 0;
31
32 // Save the position seeked to.
33 pos_arg = seek_pos = url_ftell(s->pb);
34 seek_pts = ogg_read_timestamp(s, stream_index, &pos_arg, url_fsize(s->pb));
35 + os = ogg->streams + stream_index;
36
37 // Since we have seeked to the beginning then reset lastpts and lastdts to 0.
38 if (!seek_pts) {
OLDNEW
« no previous file with comments | « no previous file | source/patched-ffmpeg-mt/libavformat/oggdec.c » ('j') | source/patched-ffmpeg-mt/libavformat/oggdec.c » ('J')

Powered by Google App Engine
This is Rietveld 408576698