Changeset 6321e028 in ffmpeg

Timestamp:

Dec 10, 2012, 11:13:42 AM (12 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

4a5289ad

Parents:

f540851c (diff), ccb59c1 (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/10/12 11:12:42)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (12/10/12 11:13:42)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: rtpdec: Remove an outdated todo comment rtpdec: Rename a static variable to normal naming conventions sh4: dsputil: remove duplicate of ff_gmc_c()

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

(No files)