diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-10 13:06:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-10 13:06:16 +0100 |
| commit | 9a714d871ac5c7dc6d35aec56caca0c5ede68fba (patch) | |
| tree | 5fb2cf0b1f1c6c8c53231cf128654e3f1f918658 /libavformat/mpegenc.c | |
| parent | d80820655362645ae1c65d457287d7d12c04a44f (diff) | |
| parent | f5fac6f77752931347ab302563802dcaa49c2419 (diff) | |
Merge commit 'f5fac6f77752931347ab302563802dcaa49c2419'
* commit 'f5fac6f77752931347ab302563802dcaa49c2419':
asfdec: support reading ID3v2 tags in ASF files
Conflicts:
Changelog
libavformat/asfdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mpegenc.c')
0 files changed, 0 insertions, 0 deletions