Merge commit '192ccc5034ad4ac1b5022fc16c1162267add6a0f'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Feb 2014 13:39:33 +0000 (14:39 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Feb 2014 13:39:33 +0000 (14:39 +0100)
commitfdba564585e50b69489a95b847df21779a7cd19a
tree83b5d797856a44bb113596174e5ac4d12f6c1843
parent3edc3b159503d512c919b3d5902f7026e961823a
parent192ccc5034ad4ac1b5022fc16c1162267add6a0f
Merge commit '192ccc5034ad4ac1b5022fc16c1162267add6a0f'

* commit '192ccc5034ad4ac1b5022fc16c1162267add6a0f':
  build: The MPEG-4 video parser depends on h263dsp

Conflicts:
configure

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