aboutsummaryrefslogtreecommitdiffstats
path: root/libswscale/x86
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-10-16 12:22:40 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-10-16 12:23:34 +0200
commit83bfcc3ce2554bd12d5eb790836530d3430bd908 (patch)
treeb56569d3f6225dcaadbfe66cc6aa3f6fa55f96e6 /libswscale/x86
parent8778c49aceb99b3a9f5f1ce30d011755e12952a9 (diff)
parent6b081eff4dfc3c899960f69f30cb567266b7dca3 (diff)
downloadffmpeg-83bfcc3ce2554bd12d5eb790836530d3430bd908.tar.gz
Merge commit '6b081eff4dfc3c899960f69f30cb567266b7dca3'
* commit '6b081eff4dfc3c899960f69f30cb567266b7dca3': fate: add vorbiscomment cover art test Conflicts: tests/fate/cover-art.mak See: 1ca3902726fb8c1398ab00d146ebe3e2f31b76e6 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/x86')
0 files changed, 0 insertions, 0 deletions