aboutsummaryrefslogtreecommitdiffstats
path: root/tests/ref/lavf/voc
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-23 14:53:39 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-11-23 14:53:39 +0100
commitf63ee2aa14ec1b018a2b78a8f543a71a9b51f9e0 (patch)
treee9c639f1380d8e5ea67d6e1772024e84e2d5b076 /tests/ref/lavf/voc
parent3e641b4842b8b5f6592991479d19f1a7ce846308 (diff)
parent6f270da61b8c9a2dc71f48ae2a21e046d7f15b69 (diff)
downloadffmpeg-f63ee2aa14ec1b018a2b78a8f543a71a9b51f9e0.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: libschroedingerenc: do not assert on values from external libraries Conflicts: libavcodec/libschroedingerenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/lavf/voc')
0 files changed, 0 insertions, 0 deletions