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)
* 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>

Trivial merge