Merge commit 'c18375ec8040a9fe0f186b2033dc975883143758'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Oct 2013 07:49:50 +0000 (09:49 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Oct 2013 07:51:00 +0000 (09:51 +0200)
commit77caa31f717a0cab628c05fcd61cf6d78fba527e
tree1b00f3dc2ae5f63f64ba76788dc3da4680e3ad15
parent92b03cf926efae224762dcc74d035cbf67b45368
parentc18375ec8040a9fe0f186b2033dc975883143758
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>
libavformat/oggparsevorbis.c