Changeset 30aa9b72 in ffmpeg

Timestamp:

Dec 12, 2013, 6:37:46 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

2644df82

Parents:

a435a033 (diff), 46c0cbd5 (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> (12/12/13 18:36:09)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (12/12/13 18:37:46)

Message:

Merge commit '46c0cbd5dc01196949105e49f2ded10aa85a6e39'

• commit '46c0cbd5dc01196949105e49f2ded10aa85a6e39': rtsp: suppress a incompatible pointer types warning

Conflicts:

libavformat/rtsp.c

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

(No files)