[FFmpeg-cvslog] Merge commit 'c6aa0554b0c3e31fec4580b68ea85b66966cd381'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jun 10 20:50:36 2015 +0200| [d784d6b7ed254dd61e4802da7d0c0c2b4894daab] | committer: Michael Niedermayer

Merge commit 'c6aa0554b0c3e31fec4580b68ea85b66966cd381'

* commit 'c6aa0554b0c3e31fec4580b68ea85b66966cd381':
  mpegvideo: Drop release_unused_pictures() function

Conflicts:
	libavcodec/mpegvideo.c

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

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