aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/audioconvert.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-07-28 12:53:17 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-07-28 12:54:14 +0200
commit453224f10b375c280ab2ef8f6e40213ba5b77d8a (patch)
tree1207dbbfc8d4b7227ae5031cf236ca8e741c63cb /libavutil/audioconvert.h
parentc11255ae8b1a6239cfde38bb6d44dde35eee9648 (diff)
parente36a2f4c5280e2779b0e88974295a711cf8d88be (diff)
downloadffmpeg-453224f10b375c280ab2ef8f6e40213ba5b77d8a.tar.gz
Merge commit 'e36a2f4c5280e2779b0e88974295a711cf8d88be'
* commit 'e36a2f4c5280e2779b0e88974295a711cf8d88be': hevc: eliminate an unnecessary array Conflicts: libavcodec/hevc.c See: 255086a7e06417d98417cea192053b8a8531eb24 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/audioconvert.h')
0 files changed, 0 insertions, 0 deletions