Merge commit 'd48430c367947a64647c6959cf472f2c01778b17'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Mar 2014 21:04:51 +0000 (22:04 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Mar 2014 21:04:51 +0000 (22:04 +0100)
commit1618f162a9daa1048c08eefe8086f78ea45e3647
treeec1c56645973ed1f52f5bed42ba2b085e8be7a7c
parent85d2b0987baeb980234c17be076108d53ffe0cd6
parentd48430c367947a64647c6959cf472f2c01778b17
Merge commit 'd48430c367947a64647c6959cf472f2c01778b17'

* commit 'd48430c367947a64647c6959cf472f2c01778b17':
  build: Let the SVQ3 decoder depend on the H.264 decoder

Conflicts:
libavcodec/Makefile

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