Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Jan 2014 18:54:41 +0000 (19:54 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Jan 2014 18:54:45 +0000 (19:54 +0100)
commit78e39aa7ee12bb61cf34d8ca6bebd129d659d9cd
tree7d3aed0445c3d2379842ea2a6dd39e3d3387ac3d
parenteef74b2e97139d8422f76a0f8241aed17fc0617d
parentb7702fafb356b757dcd1b3d1ed4f2f32e4ebe9c1
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Avoid a possible overflow when reading Nikon avi files.
  Add h263dsp dependency to mpeg1video and mpeg2video encoders.
  Fix compilation with --disable-hwaccel=mpeg1_xvmc,mpeg2_xvmc

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure