aboutsummaryrefslogtreecommitdiffstats
path: root/tests/ref/fate/ffprobe_xml
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-09-02 21:45:58 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-09-02 21:45:58 +0200
commit50c6bffb67d140bcf4b28d0b4495648b9f6b07f9 (patch)
treecd4b9a89006063727d99cb8061e6b5cf64329603 /tests/ref/fate/ffprobe_xml
parent098af260675b601c0a02a373b53ed21b77775f22 (diff)
parent74512f7e369da40e1148c92b58cd8e59f7737b8f (diff)
downloadffmpeg-50c6bffb67d140bcf4b28d0b4495648b9f6b07f9.tar.gz
Merge commit '74512f7e369da40e1148c92b58cd8e59f7737b8f'
* commit '74512f7e369da40e1148c92b58cd8e59f7737b8f': 8svx: Return proper error codes Conflicts: libavcodec/8svx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/fate/ffprobe_xml')
0 files changed, 0 insertions, 0 deletions