Changeset 054e4ba in ffmpeg

Timestamp:

Oct 28, 2013, 12:17:39 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

683ab5fe

Parents:

a1ce060c (diff), 884c7a6e (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> (10/28/13 12:13:23)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (10/28/13 12:17:39)

Message:

Merge commit '884c7a6eb86a9bc05abafc058b279018ded7de5f'

• commit '884c7a6eb86a9bc05abafc058b279018ded7de5f': avfilter: fix const use of avfilter_next

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

(No files)