aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/libwavpackenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-19 19:11:58 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-08-19 19:11:58 +0200
commit4042c8eee1879e321092d650a421d2205aac6fe0 (patch)
tree398aa4126677aef21691a4c86cbffe6af0824abd /libavcodec/libwavpackenc.c
parent580e81fca5781291950774b18965cc7322f77cb2 (diff)
parent14d2006ca6c0e2b54784b93560f09e0e19c0a270 (diff)
downloadffmpeg-4042c8eee1879e321092d650a421d2205aac6fe0.tar.gz
Merge commit '14d2006ca6c0e2b54784b93560f09e0e19c0a270'
* commit '14d2006ca6c0e2b54784b93560f09e0e19c0a270': pcm: Drop unused variable from DECODE_PLANAR macro Conflicts: libavcodec/pcm.c No change as the changed code isnt in ffmpeg Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libwavpackenc.c')
0 files changed, 0 insertions, 0 deletions