Merge commit '282c6a1a0ef3e8c8e180c15b39cfe5b89704d848'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 02:46:42 +0000 (03:46 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 02:46:47 +0000 (03:46 +0100)
commit52b69fa142cb445c191852a9f9d9dcddf80e95e4
tree555a3403cd3bd87a570c7d9484176be223aba4c8
parentf1db3f5f593138a9704dc3e4e91871e59289c843
parent282c6a1a0ef3e8c8e180c15b39cfe5b89704d848
Merge commit '282c6a1a0ef3e8c8e180c15b39cfe5b89704d848'

* commit '282c6a1a0ef3e8c8e180c15b39cfe5b89704d848':
  mpegvideo: make ff_release_unused_pictures() static

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