Revert two backports to release/1.2 that broke fate.
authorCarl Eugen Hoyos <cehoyos@ag.or.at>
Thu, 19 Jun 2014 23:58:14 +0000 (01:58 +0200)
committerCarl Eugen Hoyos <cehoyos@ag.or.at>
Thu, 19 Jun 2014 23:58:14 +0000 (01:58 +0200)
commit3ac85d70f09dd8ffa96c3f4a13a93f0f465ba6a4
treeea0a1cd7c54d90d2af4cc9a7d63e7458d14665b6
parent401b3dafd989b4a016064e1906086be5ff3ea39a
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.
libavformat/aiffdec.c
libavformat/asfdec.c
libavformat/id3v2.c
libavformat/id3v2.h
libavformat/omadec.c
libavformat/utils.c