Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 7 Jun 2013 08:17:14 +0000 (10:17 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 7 Jun 2013 08:17:20 +0000 (10:17 +0200)
* qatar/master:
  rtpdec: Fix the alphabetical ordering in registering depacketizers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/rtpdec.c

Simple merge