[SCM] libav/experimental: Remove old_flags variable, which is a duplicate of the flags variable.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:49:32 UTC 2013
The following commit has been merged in the experimental branch:
commit 7a4a64e7ab654018facd0fd82624bf8c1da0b673
Author: Ronald S. Bultje <rsbultje at gmail.com>
Date: Thu Jul 30 15:05:33 2009 +0000
Remove old_flags variable, which is a duplicate of the flags variable.
Originally committed as revision 19540 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c
index f3c3019..10e7c2a 100644
--- a/libavformat/rmdec.c
+++ b/libavformat/rmdec.c
@@ -810,7 +810,7 @@ static int rm_read_packet(AVFormatContext *s, AVPacket *pkt)
AVStream *st;
int i, len, res, seq = 1;
int64_t timestamp, pos;
- int old_flags, flags;
+ int flags;
for (;;) {
if (rm->audio_pkt_cnt) {
@@ -836,10 +836,9 @@ static int rm_read_packet(AVFormatContext *s, AVPacket *pkt)
if(len<0 || url_feof(s->pb))
return AVERROR(EIO);
- old_flags = flags;
res = ff_rm_parse_packet (s, s->pb, st, st->priv_data, len, pkt,
&seq, flags, timestamp);
- if((old_flags&2) && (seq&0x7F) == 1)
+ if((flags&2) && (seq&0x7F) == 1)
av_add_index_entry(st, pos, timestamp, 0, 0, AVINDEX_KEYFRAME);
if (res)
continue;
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list