Changeset b84cd22a in ffmpeg

Timestamp:

Nov 4, 2013, 8:19:25 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

be41f21

Parents:

85cabf1c (diff), 446e37d (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> (11/04/13 20:01:58)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (11/04/13 20:19:25)

Message:

Merge commit '446e37dc97e533e37f6aa0a11355124207e3a7f7'

• commit '446e37dc97e533e37f6aa0a11355124207e3a7f7': vf_fieldorder: remove superfluous get_video_buffer

Conflicts:

libavfilter/vf_fieldorder.c

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

(No files)