Merge commit '1f8eb69079880ef1f394c498dfdf471f91222a06'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 01:12:11 +0000 (02:12 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 01:12:59 +0000 (02:12 +0100)
commit20b28fc7b0aaa41c1837bf234e599d1714bc4d35
tree7374533b7fffbacf2225c62569e82047273612ca
parent2951b7fb1d3be236312e27a6dd6dc1dcfc467841
parent1f8eb69079880ef1f394c498dfdf471f91222a06
Merge commit '1f8eb69079880ef1f394c498dfdf471f91222a06'

* commit '1f8eb69079880ef1f394c498dfdf471f91222a06':
  mpegvideo: move encoding-only initialization from common_init() to encode_init()

Conflicts:
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c

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