Changeset c427b2b8 in ffmpeg

Timestamp:

Feb 20, 2014, 2:43:03 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

d089e9a4

Parents:

add54280 (diff), 4bcca361 (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> (02/20/14 14:42:50)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (02/20/14 14:43:03)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: mpeg4video_parser: Drop pointless av_-prefix from static function

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

(No files)