Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 10 Dec 2012 11:12:42 +0000 (12:12 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 10 Dec 2012 11:13:42 +0000 (12:13 +0100)
commit6321e02896350f3ff3a3531dc5484e145c4ea524
tree89e73ef5c3fd7b702e568efc28e48af968b9a9d6
parentf540851ce320bc69621ea70b89857c54129c82c2
parentccb59c106a4361b9655aa094b042863d655860c4
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>
libavcodec/sh4/dsputil_align.c
libavcodec/sh4/qpel.c
libavformat/rtpdec.c