generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

oma: refactor seek function

Browse Source 
Properly propagate seek errors from avio and the generic pcm seek.

(cherry picked from commit 4f03a77e52)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Conflicts:
	libavformat/omadec.c
This commit is contained in:
Luca Barbato
2013-05-04 07:40:09 +02:00
parent 116aa30db4
commit 0b6adcf76b
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
libavformat/omadec.c
View File

@@ -427,23 +427,26 @@ static int oma_read_probe(AVProbeData *p)
static int oma_read_seek(struct AVFormatContext *s, int stream_index, int64_t timestamp, int flags) static int oma_read_seek(struct AVFormatContext *s, int stream_index, int64_t timestamp, int flags)
{ {
OMAContext *oc = s->priv_data; OMAContext *oc = s->priv_data;
int err = ff_pcm_read_seek(s, stream_index, timestamp, flags);
ff_pcm_read_seek(s, stream_index, timestamp, flags); if (!oc->encrypted)
return err;
if (oc->encrypted) { /* readjust IV for CBC */
/* readjust IV for CBC */ if (err || avio_tell(s->pb) < oc->content_start)
int64_t pos = avio_tell(s->pb); goto wipe;
if (pos < oc->content_start) if ((err = avio_seek(s->pb, -8, SEEK_CUR)) < 0)
memset(oc->iv, 0, 8); goto wipe;
else { if ((err = avio_read(s->pb, oc->iv, 8)) < 8) {
if (avio_seek(s->pb, -8, SEEK_CUR) < 0 || avio_read(s->pb, oc->iv, 8) < 8) { if (err >= 0)
memset(oc->iv, 0, 8); err = AVERROR_EOF;
return -1; goto wipe;
}
}
} }
return 0; return 0;
wipe:
memset(oc->iv, 0, 8);
return err;
} }
AVInputFormat ff_oma_demuxer = { AVInputFormat ff_oma_demuxer = {