aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/camellia.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-05-05 22:20:02 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-05-05 22:20:36 +0200
commit54d985db847bb3b9b9a45790bc9343c4afe0b14e (patch)
tree35754426c5bc8a5858c60719f416178723e6ac9e /libavutil/camellia.h
parent5a455dd011151fd7e3f8aced745b206ca1413d29 (diff)
parent8fc8024ea56e814cd257d5fe27b21a865080782f (diff)
downloadffmpeg-54d985db847bb3b9b9a45790bc9343c4afe0b14e.tar.gz
Merge commit '8fc8024ea56e814cd257d5fe27b21a865080782f'
* commit '8fc8024ea56e814cd257d5fe27b21a865080782f': aasc: return correct buffer size from aasc_decode_frame See: 0be54ad280cf114c02306b7063147e8379f8ed1e Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/camellia.h')
0 files changed, 0 insertions, 0 deletions