[FFmpeg-cvslog] Merge remote-tracking branch 'cehoyos/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May 28 14:12:42 2015 +0200| [b06e82e73897e7afd1363f60015f5cbf6d39c984] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b06e82e73897e7afd1363f60015f5cbf6d39c984
---