Merge commit 'b21af32aed7e343f962753943e9f16baedfb1750'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Mar 2015 01:06:44 +0000 (02:06 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Mar 2015 01:23:29 +0000 (02:23 +0100)
commit2850131f2c7abaede32b39ed6eaeecfbf77e6042
treeae4954eb725a72599a3027fe25a7e7c0e62f5b0c
parent3e3995619807b01166df5f3edd1edf64af211b1c
parentb21af32aed7e343f962753943e9f16baedfb1750
Merge commit 'b21af32aed7e343f962753943e9f16baedfb1750'

* commit 'b21af32aed7e343f962753943e9f16baedfb1750':
  lavc: Prefer x264 over openh264 if both libraries are available

See: ddae03f69bc1c6ec97c028c91837710944427b83
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/allcodecs.c