diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-06 12:05:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-06 12:05:17 +0100 |
| commit | f74be3669daa8b471fb8919fa980d9bed3207af2 (patch) | |
| tree | bfdf6fa599e90dab47753d0b7974421d6766023f /libavformat/flic.c | |
| parent | 7ffdc7bef2f9d7e90487f816a97a3496b0639450 (diff) | |
| parent | 2f3fadfbe3c6ad52fad5c614b6067c5401227959 (diff) | |
| download | ffmpeg-f74be3669daa8b471fb8919fa980d9bed3207af2.tar.gz | |
Merge commit '2f3fadfbe3c6ad52fad5c614b6067c5401227959'
* commit '2f3fadfbe3c6ad52fad5c614b6067c5401227959':
lavc,lavf: switch to the new vorbis parse API
Conflicts:
libavformat/oggparsevorbis.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/flic.c')
0 files changed, 0 insertions, 0 deletions