Changeset b06e82e7 in ffmpeg

Timestamp:

May 28, 2015, 12:12:46 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

0ad04bf6

Parents:

5a3d2541 (diff), 4792fb94 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (05/28/15 12:12:42)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (05/28/15 12:12:46)

Message:

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>

(No files)