aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/alac_data.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-07-17 21:59:45 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2015-07-17 21:59:45 +0200
commit77cd5193a5a5f745769123466b13aa52481436a2 (patch)
treefe190d7439a9182dfcb8050e1072af5916d4443e /libavcodec/alac_data.c
parentccd3edf81fc2f5a70f1218ce0b3595481bfec0e6 (diff)
parent575ec60e542114b2ef5b2f88b28eeb72389dda45 (diff)
downloadffmpeg-77cd5193a5a5f745769123466b13aa52481436a2.tar.gz
Merge commit '575ec60e542114b2ef5b2f88b28eeb72389dda45'
* commit '575ec60e542114b2ef5b2f88b28eeb72389dda45': configure: Factor out mss34dsp module Conflicts: libavcodec/Makefile Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/alac_data.c')
0 files changed, 0 insertions, 0 deletions