OSDN Git Service

Merge commit '2eaa3663fda750dac66d41fe8541a8744d5563a4'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Mar 2013 00:31:46 +0000 (01:31 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Mar 2013 00:31:46 +0000 (01:31 +0100)
commitb94df21a5164c7f1591935deccc13f85d8c43717
tree5fcd0f9edb3359bf6051c7043f6c951ce3a8c545
parentd469fa1923958f98df9d9b0a9cc167248d8516fb
parent2eaa3663fda750dac66d41fe8541a8744d5563a4
Merge commit '2eaa3663fda750dac66d41fe8541a8744d5563a4'

* commit '2eaa3663fda750dac66d41fe8541a8744d5563a4':
  avplay: enable only when SDL 1.2 is found

Conflicts:
configure

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