Merge commit '14d2006ca6c0e2b54784b93560f09e0e19c0a270'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 19 Aug 2014 17:11:58 +0000 (19:11 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 19 Aug 2014 17:11:58 +0000 (19:11 +0200)
commit4042c8eee1879e321092d650a421d2205aac6fe0
tree398aa4126677aef21691a4c86cbffe6af0824abd
parent580e81fca5781291950774b18965cc7322f77cb2
parent14d2006ca6c0e2b54784b93560f09e0e19c0a270
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>