diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-06 12:24:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-06 12:24:13 +0200 |
| commit | 4634871b513cc3eef74087e04ce0c542bdd2c393 (patch) | |
| tree | bd833c6e6ce3178088cd5f3af6c4e279ecd52267 /libavformat/apetag.h | |
| parent | c86955d24a4311721bf72cce21ebb14460a02ef9 (diff) | |
| parent | 90e15e340d97aebb5d2318020b5a516804d4c7c1 (diff) | |
| download | ffmpeg-4634871b513cc3eef74087e04ce0c542bdd2c393.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
oggparsevorbis: return meaningful errors
Conflicts:
libavformat/oggparsevorbis.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/apetag.h')
0 files changed, 0 insertions, 0 deletions