diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-30 02:58:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-30 02:58:38 +0200 |
| commit | 55ce3c67bb25cd44889f2143ce9fd7dac3ab4a9d (patch) | |
| tree | 20f16981174b1d3469daf22217b98e24e311e62f /libavformat | |
| parent | cd39549e2c386edfa5f4d4bdc0cda78f882a4fe4 (diff) | |
| download | ffmpeg-55ce3c67bb25cd44889f2143ce9fd7dac3ab4a9d.tar.gz | |
Merge remote-tracking branch 'ffmpeg-mt/master'
* ffmpeg-mt/master:
Update todo. More items appeared...
Fix mdec
Duplicate: id3v1: change filesize to int64_t.
Duplicate: id3v1: Seek back to old position after reading.
Conflicts:
libavcodec/mpegvideo.c
libavcodec/snow.c
libavformat/id3v1.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/id3v1.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/id3v1.c b/libavformat/id3v1.c index 4f9b5840ec..365c3e0fab 100644 --- a/libavformat/id3v1.c +++ b/libavformat/id3v1.c @@ -227,7 +227,7 @@ void ff_id3v1_read(AVFormatContext *s) { int ret; uint8_t buf[ID3v1_TAG_SIZE]; - int64_t filesize, position = url_ftell(s->pb); + int64_t filesize, position = avio_tell(s->pb); if (!url_is_streamed(s->pb)) { /* XXX: change that */ |