aboutsummaryrefslogtreecommitdiffstats
path: root/libswresample
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-03-08 11:38:55 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-03-08 11:40:00 +0100
commitfc9b4074873b99a62f09fb8b7844f4af78511bcf (patch)
treea782f3885ad902f87905647a661c895940ed62c0 /libswresample
parent65ba90eac6fde92b078f8c012f591382b44ac88b (diff)
parent0f9f7969ef4df3661131cede3e8cc770e1ea3db8 (diff)
downloadffmpeg-fc9b4074873b99a62f09fb8b7844f4af78511bcf.tar.gz
Merge commit '0f9f7969ef4df3661131cede3e8cc770e1ea3db8'
* commit '0f9f7969ef4df3661131cede3e8cc770e1ea3db8': rmdec: Improve message for demux error See: 3880b4541ace2697f380ae1f43cb2299efeb2cc7 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample')
0 files changed, 0 insertions, 0 deletions