aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/hmac.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-21 21:56:33 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-08-21 21:56:33 +0200
commitfca76dc61ed650477c6e537b9db7c4ae2767197b (patch)
treec01c02fc8e7e628da3eb9662a3a57e1ed84d6e59 /libavutil/hmac.c
parent2bfd4ff16dddc46d30b9e3510cb31e3b1b1b90fe (diff)
parent13c90bc9a359e969cc2b7f7e8199b02a0e4c6ec9 (diff)
downloadffmpeg-fca76dc61ed650477c6e537b9db7c4ae2767197b.tar.gz
Merge commit '13c90bc9a359e969cc2b7f7e8199b02a0e4c6ec9'
* commit '13c90bc9a359e969cc2b7f7e8199b02a0e4c6ec9': adts: Return more meaningful error codes Conflicts: libavformat/adtsenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/hmac.c')
0 files changed, 0 insertions, 0 deletions