Merge commit 'c6aa0554b0c3e31fec4580b68ea85b66966cd381'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Jun 2015 18:50:36 +0000 (20:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Jun 2015 18:50:36 +0000 (20:50 +0200)
commitd784d6b7ed254dd61e4802da7d0c0c2b4894daab
tree074de940d6dcdaa39fe9529b8bcb760f598ed2fb
parent88679aeb08b9b29613d283eb5ad29abbabd5a9e9
parentc6aa0554b0c3e31fec4580b68ea85b66966cd381
Merge commit 'c6aa0554b0c3e31fec4580b68ea85b66966cd381'

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

Conflicts:
libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpegvideo.c