aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/adpcm_data.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-03-12 16:15:08 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-03-12 16:15:08 +0100
commit7787a6c7caa0a3bdca3b479286def754e6f56cf0 (patch)
tree0a77c8060fd87f6e2a6d0cae72907bcf9d2e5742 /libavcodec/adpcm_data.h
parent6ec0447d3d220bc113a69fac04f8b2a423342479 (diff)
parentcacad1c058f66558ec727faac3b277d2dee264d4 (diff)
downloadffmpeg-7787a6c7caa0a3bdca3b479286def754e6f56cf0.tar.gz
Merge commit 'cacad1c058f66558ec727faac3b277d2dee264d4'
* commit 'cacad1c058f66558ec727faac3b277d2dee264d4': wmaprodec: require block_align to be set. wmadec: require block_align to be set. ivi_common: do not call MC for intra frames when dc_transform is unset Conflicts: libavcodec/ivi_common.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/adpcm_data.h')
0 files changed, 0 insertions, 0 deletions