Merge commit 'e89247debd5276d57ce4a26516224204f9541af0'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Nov 2013 02:46:49 +0000 (03:46 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Nov 2013 02:46:53 +0000 (03:46 +0100)
commit47e5eaf8c9869e8e34e96252b8eeaabec7bcc894
treef76f69f271c743211df4eb75a6a4f41f3d6aed10
parentf4c28aea38aeda38d233c57fa6e0a2f52e1f5416
parente89247debd5276d57ce4a26516224204f9541af0
Merge commit 'e89247debd5276d57ce4a26516224204f9541af0'

* commit 'e89247debd5276d57ce4a26516224204f9541af0':
  mpeg4videodec: replace MpegEncContext.reduced_res_vop with a local variable

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