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)
* 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>
1  2 
libavcodec/sh4/dsputil_align.c
libavcodec/sh4/qpel.c
libavformat/rtpdec.c

Simple merge
Simple merge
Simple merge