aboutsummaryrefslogtreecommitdiffstats
path: root/libswresample
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-06-29 11:37:38 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-06-29 11:47:26 +0200
commit562e8d019ba2205a31cf78808e9c4d633bd158be (patch)
tree6b9207a3db3398917a36b7e328fef3f5e0a4ba88 /libswresample
parent3e33db3f652e019c18f5b4c5247396dd18f9a15a (diff)
parent6652338f43ef623045912d7f28b61adea05d27ae (diff)
downloadffmpeg-562e8d019ba2205a31cf78808e9c4d633bd158be.tar.gz
Merge commit '6652338f43ef623045912d7f28b61adea05d27ae'
* commit '6652338f43ef623045912d7f28b61adea05d27ae': wmapro: return early on unsupported condition Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample')
0 files changed, 0 insertions, 0 deletions