Merge commit 'a61c2115fb936d50b8b0328d00562fe529a7c46a'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Apr 2014 23:32:04 +0000 (01:32 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Apr 2014 23:47:53 +0000 (01:47 +0200)
commit21c7e99659bea1ed735caa83399a5777957a8e16
treebbd48ff5d66fa33e75aea9580aa881a09f25966d
parentc6eee3120a594cf25feb892f952a409a512d182e
parenta61c2115fb936d50b8b0328d00562fe529a7c46a
Merge commit 'a61c2115fb936d50b8b0328d00562fe529a7c46a'

* commit 'a61c2115fb936d50b8b0328d00562fe529a7c46a':
  configure: rework dxva in avconv handling

Conflicts:
Makefile
configure

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