Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 28 May 2015 12:12:42 +0000 (14:12 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 28 May 2015 12:12:46 +0000 (14:12 +0200)
commitb06e82e73897e7afd1363f60015f5cbf6d39c984
tree74177e40f4d6737307317a177055f8ed749c69ae
parent5a3d2541bd59b52e9357f3f55499e98c3d4e522a
parent4792fb94098cf47bd8caf9b3a9795c666bae2220
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  lavc/x264: Support bgr0 as input pix_fmt.
  lavf: Use av_codec_get_tag2() in avformat_query_codec().

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