Changeset 50ffd843 in ffmpeg

Timestamp:

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

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

a1cb4efd

Parents:

cdf6a944 (diff), b03b2d8 (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:12:49)

git-committer:

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

Message:

Merge commit 'b03b2d86aa9d79670825b42d8a8a7c41f59cb444'

• commit 'b03b2d86aa9d79670825b42d8a8a7c41f59cb444': buffersrc: avoid using AV_PIX_FMT_NB

Conflicts:

libavfilter/buffersrc.c

No change as AV_PIX_FMT_NB was not used by our buffersrc.c
See: 0d58bbb28d90a16bdb0ece6f5c67e12167a67a0f
Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)