Merge commit '6af2930222ee5d8ce19f3b999a78d85a3c457391'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 19 Aug 2014 17:13:49 +0000 (19:13 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 19 Aug 2014 17:13:49 +0000 (19:13 +0200)
commit746095bc29817875ac89a7d4771f8a54895b3cbb
tree398aa4126677aef21691a4c86cbffe6af0824abd
parent4042c8eee1879e321092d650a421d2205aac6fe0
parent6af2930222ee5d8ce19f3b999a78d85a3c457391
Merge commit '6af2930222ee5d8ce19f3b999a78d85a3c457391'

* commit '6af2930222ee5d8ce19f3b999a78d85a3c457391':
  pcm: Drop av_unused attribute from variable that is always used

Conflicts:
libavcodec/pcm.c

No change as there is no such av_unused variable in ffmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>