[FFmpeg-cvslog] Merge commit '6af2930222ee5d8ce19f3b999a78d85a3c457391'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Aug 19 19:13:49 2014 +0200| [746095bc29817875ac89a7d4771f8a54895b3cbb] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=746095bc29817875ac89a7d4771f8a54895b3cbb
---