Merge commit 'bedf952bb80ae26427854dcde56c139ecb87d4a0'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 00:58:28 +0000 (01:58 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 00:58:55 +0000 (01:58 +0100)
commit2951b7fb1d3be236312e27a6dd6dc1dcfc467841
tree1ad338427924c6bfd48452d80ccec15f352403da
parent16338b4fb961acc9e6a21586987266ff9862545d
parentbedf952bb80ae26427854dcde56c139ecb87d4a0
Merge commit 'bedf952bb80ae26427854dcde56c139ecb87d4a0'

* commit 'bedf952bb80ae26427854dcde56c139ecb87d4a0':
  mpegvideo: move setting encoding-only vars from common_defaults() to encode_defaults()

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