aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/pcm.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-05-09 11:35:37 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-05-09 11:36:29 +0200
commit164899c6e8588c25a1b50d0a0ea285812c36e3d3 (patch)
tree0a96263d98511208753d8ed5edf8d0ece49a18a8 /libavformat/pcm.h
parent5747d835c775597dcfd8ee1c49dfa5c6fe391c7c (diff)
parent71469f3b636fbe06b6aca5933f9fdebddd8d5f57 (diff)
downloadffmpeg-164899c6e8588c25a1b50d0a0ea285812c36e3d3.tar.gz
Merge commit '71469f3b636fbe06b6aca5933f9fdebddd8d5f57'
* commit '71469f3b636fbe06b6aca5933f9fdebddd8d5f57': x86: dsputil: Move constant declarations into separate header Conflicts: libavcodec/x86/dsputil_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/pcm.h')
0 files changed, 0 insertions, 0 deletions