aboutsummaryrefslogtreecommitdiffstats
path: root/doc/ffprobe.xsd
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-01-22 13:38:20 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-01-22 13:38:20 +0100
commitb4a7f4d018aaeb29d18d5982e7234e472b58bac6 (patch)
tree4bd0ffbc2080ad8e9596ef37723b58aa29ed2acf /doc/ffprobe.xsd
parent0a84174f2d41757bcefdc87e9dfb26a7016ab62f (diff)
parent570a4a0189946c2c983da41d37fdd67fa13266e7 (diff)
downloadffmpeg-b4a7f4d018aaeb29d18d5982e7234e472b58bac6.tar.gz
Merge commit '570a4a0189946c2c983da41d37fdd67fa13266e7'
* commit '570a4a0189946c2c983da41d37fdd67fa13266e7': avidec: use sensible error codes instead of -1 Conflicts: libavformat/avidec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/ffprobe.xsd')
0 files changed, 0 insertions, 0 deletions