diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-13 09:49:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-13 09:51:00 +0200 |
| commit | 77caa31f717a0cab628c05fcd61cf6d78fba527e (patch) | |
| tree | 1b00f3dc2ae5f63f64ba76788dc3da4680e3ad15 /libavformat/bluray.c | |
| parent | 92b03cf926efae224762dcc74d035cbf67b45368 (diff) | |
| parent | c18375ec8040a9fe0f186b2033dc975883143758 (diff) | |
| download | ffmpeg-77caa31f717a0cab628c05fcd61cf6d78fba527e.tar.gz | |
Merge commit 'c18375ec8040a9fe0f186b2033dc975883143758'
* commit 'c18375ec8040a9fe0f186b2033dc975883143758':
oggvorbisdec: add support for embedded cover art
Conflicts:
libavformat/oggparsevorbis.c
See: 193782216fc8179ec92d498449be0a51e4c7c658
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/bluray.c')
0 files changed, 0 insertions, 0 deletions