Changeset 74a8dbe1 in ffmpeg

Timestamp:

Apr 19, 2014, 4:20:17 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

6ca0a976

Parents:

010732b (diff), 58400ac1 (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 '58400ac133bcfb6bf8196b4e5208bc178307739b'

• commit '58400ac133bcfb6bf8196b4e5208bc178307739b': lavfi: name anonymous structs

Conflicts:

libavfilter/buffersink.c
libavfilter/f_select.c
libavfilter/src_movie.c
libavfilter/vf_drawbox.c
libavfilter/vf_drawtext.c
libavfilter/vf_overlay.c
libavfilter/vf_showinfo.c
libavfilter/vf_unsharp.c

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

(No files)