Changeset 1945db1f in ffmpeg

Timestamp:

Oct 25, 2014, 1:08:19 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

6d2a2bfb

Parents:

4ef02ddd (diff), ac84c1ce (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.

Message:

Merge commit 'ac84c1ce24a285f9cf16d4297bce73b1c4a6e435'

• commit 'ac84c1ce24a285f9cf16d4297bce73b1c4a6e435': avfilter: check filter link validity

Conflicts:

libavfilter/avfilter.c

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

(No files)