diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-21 03:23:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-21 03:37:05 +0200 |
| commit | 10d2ae8cf78ed7e23c6342200fa4d8a5355e87f2 (patch) | |
| tree | ad169614a86989dbb4ead1e188d2ad71ef7bfcf7 /libavformat/asfdec.c | |
| parent | 2c18893a911657205bd45ff8a666882610e57700 (diff) | |
| parent | f83acb096c0ea1ec181941c141d1ab6fb24820eb (diff) | |
| download | ffmpeg-10d2ae8cf78ed7e23c6342200fa4d8a5355e87f2.tar.gz | |
Merge remote branch 'qatar/master'
* qatar/master:
Makefile: Include dependencies for test tools, too
Remove a version check in av_log made unnecessary by the big bump.
update last major version increase dates in APIchanges
Reduce picture size for yadif.
oggdec: use av_freep() instead of av_free()
avio: Fix sanity checks in ffurl_read*
libavformat: Free AVFormatContext->streams
libavformat: Make protocols pass URLContext as log context where available
asf: remove commented out code in asf_read_seek
not pulled: libpostproc: Remove crufty code disabled by the big bump.
Reflect 0.7_beta1 release in the Changelog
not pulled: sws: remove disabled cruft.
lavu: remove disabled ff_random_get_seed cruft.
lavu: remove disabled sha1 cruft.
Conflicts:
Changelog
libavutil/sha1.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/asfdec.c')
| -rw-r--r-- | libavformat/asfdec.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c index 8e228c6c34..63c18303c6 100644 --- a/libavformat/asfdec.c +++ b/libavformat/asfdec.c @@ -1262,27 +1262,6 @@ static int asf_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int /* find the position */ pos = st->index_entries[index].pos; - // various attempts to find key frame have failed so far - // asf_reset_header(s); - // avio_seek(s->pb, pos, SEEK_SET); - // key_pos = pos; - // for(i=0;i<16;i++){ - // pos = avio_tell(s->pb); - // if (av_read_frame(s, &pkt) < 0){ - // av_log(s, AV_LOG_INFO, "seek failed\n"); - // return -1; - // } - // asf_st = s->streams[stream_index]->priv_data; - // pos += st->parser->frame_offset; - // - // if (pkt.size > b) { - // b = pkt.size; - // key_pos = pos; - // } - // - // av_free_packet(&pkt); - // } - /* do the seek */ av_log(s, AV_LOG_DEBUG, "SEEKTO: %"PRId64"\n", pos); avio_seek(s->pb, pos, SEEK_SET); |