Commit 746095bc authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '6af29302'

* commit '6af29302':
  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: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 4042c8ee 6af29302
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment