summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-06-07 10:17:14 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-06-07 10:17:20 +0200
commit9c9d2e9c77935e381accc160442c3e6f3308d682 (patch)
treea9ff61b6274c6d00ef286b8ef9d0a6dfe4c95ad3
parenta18bf95a8ec4cc2459aa3860e99f2945d7976835 (diff)
parentaa2c918f7d1af168850174114d6aa4e43830bed6 (diff)
Merge remote-tracking branch 'qatar/master'
* qatar/master: rtpdec: Fix the alphabetical ordering in registering depacketizers Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavformat/rtpdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c
index b512b8975f..b2342f1824 100644
--- a/libavformat/rtpdec.c
+++ b/libavformat/rtpdec.c
@@ -78,8 +78,8 @@ void av_register_rtp_dynamic_payload_handlers(void)
ff_register_dynamic_payload_handler(&ff_mpeg_video_dynamic_handler);
ff_register_dynamic_payload_handler(&ff_mpeg4_generic_dynamic_handler);
ff_register_dynamic_payload_handler(&ff_mpegts_dynamic_handler);
- ff_register_dynamic_payload_handler(&ff_ms_rtp_asf_pfv_handler);
ff_register_dynamic_payload_handler(&ff_ms_rtp_asf_pfa_handler);
+ ff_register_dynamic_payload_handler(&ff_ms_rtp_asf_pfv_handler);
ff_register_dynamic_payload_handler(&ff_qcelp_dynamic_handler);
ff_register_dynamic_payload_handler(&ff_qdm2_dynamic_handler);
ff_register_dynamic_payload_handler(&ff_qt_rtp_aud_handler);