Changeset c9eb2ce0 in ffmpeg

Timestamp:

Sep 17, 2013, 9:28:16 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

9589b619

Parents:

953a4191 (diff), 666ed7ed (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> (09/17/13 09:28:12)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (09/17/13 09:28:16)

Message:

Merge commit '666ed7eda1d568638689ac7b0cef0a9e564ffbdf'

• commit '666ed7eda1d568638689ac7b0cef0a9e564ffbdf': rtmp: Drop an unneeded warning

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

(No files)