Merge commit '8b5007a31b8d1ddbe3661bf45a732336450b7d25'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Jun 2015 18:47:14 +0000 (20:47 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Jun 2015 18:47:14 +0000 (20:47 +0200)
commit58f63670e173c1113ab231850572be303a21faef
tree5249a0ca6dc3250c0cd96516888ef57495aace25
parentc39637f36aa3a942efaa098854bd0c2ae612bcd0
parent8b5007a31b8d1ddbe3661bf45a732336450b7d25
Merge commit '8b5007a31b8d1ddbe3661bf45a732336450b7d25'

* commit '8b5007a31b8d1ddbe3661bf45a732336450b7d25':
  mpegvideo: Move ER functions to a separate file

Conflicts:
libavcodec/mpegvideo.c

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