Merge commit '8d695dc411c1ae28477f107d6f7bf2db59af95df'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Jun 2014 22:57:41 +0000 (00:57 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Jun 2014 22:57:47 +0000 (00:57 +0200)
commit412015694c083ccbd5f66ffd8b078f53e8a6ab6a
tree1d0248f2b95b4e441428c127ca756fa2d69b7ef3
parentffc2c095ef7c4bf8b330a841f9ed76b0648bbc2d
parent8d695dc411c1ae28477f107d6f7bf2db59af95df
Merge commit '8d695dc411c1ae28477f107d6f7bf2db59af95df'

* commit '8d695dc411c1ae28477f107d6f7bf2db59af95df':
  mpeg: Mark ff_mpeg_set_erpic() static

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