Changeset a1cb4efd in ffmpeg

Timestamp:

May 27, 2014, 1:23:23 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

a0c5cd34

Parents:

50ffd843 (diff), 7cc4c9f3 (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/27/14 01:22:45)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (05/27/14 01:23:23)

Message:

Merge commit '7cc4c9f32f446feaec5447e3d097e8147e35f156'

• commit '7cc4c9f32f446feaec5447e3d097e8147e35f156': lavfi/formats: avoid using AV_{PIX,SAMPLE}_FMT_NB

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

(No files)