diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-06-20 01:58:14 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-06-20 01:58:14 +0200 |
| commit | 3ac85d70f09dd8ffa96c3f4a13a93f0f465ba6a4 (patch) | |
| tree | ea0a1cd7c54d90d2af4cc9a7d63e7458d14665b6 /libavformat/utils.c | |
| parent | 401b3dafd989b4a016064e1906086be5ff3ea39a (diff) | |
| download | ffmpeg-3ac85d70f09dd8ffa96c3f4a13a93f0f465ba6a4.tar.gz | |
Revert two backports to release/1.2 that broke fate.
Revert "ff_id3v2_read: add option to limit ID3 magic number search"
Revert "ff_id3v2_free_extra_meta: set the pointer pointing to extra_meta to NULL"
This reverts commit 7f8aa37bc3666d060b3eb2baa02fcea3597a22fd.
This reverts commit 5219e20d58e15305e188ba60a75bfc37a1f82341.
Diffstat (limited to 'libavformat/utils.c')
| -rw-r--r-- | libavformat/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 821b23d642..d32f584197 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -620,7 +620,7 @@ int avformat_open_input(AVFormatContext **ps, const char *filename, AVInputForma /* e.g. AVFMT_NOFILE formats will not have a AVIOContext */ if (s->pb) - ff_id3v2_read(s, ID3v2_DEFAULT_MAGIC, &id3v2_extra_meta, 0); + ff_id3v2_read(s, ID3v2_DEFAULT_MAGIC, &id3v2_extra_meta); if (!(s->flags&AVFMT_FLAG_PRIV_OPT) && s->iformat->read_header) if ((ret = s->iformat->read_header(s)) < 0) |