aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/internal.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-12-10 02:06:50 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-12-10 02:06:50 +0100
commita93369845783a5a63e713c143cab2c550a6ccd82 (patch)
tree582b1a0ac80490ef54f09287c5613dfdb6154ca6 /libavutil/internal.h
parentb7d8484f272b7a5a2ed9db76d5182dbd6e3e6992 (diff)
parent30b39164256999efc8d77edc85e2e0b963c24834 (diff)
downloadffmpeg-a93369845783a5a63e713c143cab2c550a6ccd82.tar.gz
Merge commit '30b39164256999efc8d77edc85e2e0b963c24834'
* commit '30b39164256999efc8d77edc85e2e0b963c24834': ac3dec: make downmix() take array of pointers to channel data Conflicts: libavcodec/ac3dsp.c libavcodec/ac3dsp.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/internal.h')
0 files changed, 0 insertions, 0 deletions