Changeset a51b192f in ffmpeg

Timestamp:

Feb 24, 2015, 9:26:15 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

2bedcbf8

Parents:

8c6651a1 (diff), db158f0 (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 'db158f0dd217cf839be8af195d66cf49a76537a8'

• commit 'db158f0dd217cf839be8af195d66cf49a76537a8': rtpdec: Remove unnecessary _if_needed suffixes on functions

Conflicts:

libavformat/rtpdec_xiph.c

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

(No files)