diff options
| author | Michael Niedermayer <[email protected]> | 2013-04-12 15:19:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-04-12 15:19:32 +0200 |
| commit | 7b6c0bda9e94a9214445f83a4a469110b235dbde (patch) | |
| tree | 4fd265135b63d1eb69922e955ee5719a9c1c7d1e /libavcodec/vorbis_parser.c | |
| parent | 9a91c67478cd46d8c43774f8e1876d90323432d3 (diff) | |
| parent | bee2d75b66e2f02e0877796c01202299a4b56cfb (diff) | |
Merge commit 'bee2d75b66e2f02e0877796c01202299a4b56cfb'
* commit 'bee2d75b66e2f02e0877796c01202299a4b56cfb':
avconv: update to the new options syntax.
Conflicts:
ffmpeg_filter.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavcodec/vorbis_parser.c')
0 files changed, 0 insertions, 0 deletions