Merge commit 'feeafb4adabd5c17de1738ed9962e40892b20edb'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 29 Oct 2013 10:06:24 +0000 (11:06 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 29 Oct 2013 10:06:32 +0000 (11:06 +0100)
* commit 'feeafb4adabd5c17de1738ed9962e40892b20edb':
  lavf: do not export av_register_{rtp,rdt}_dynamic_payload_handlers from shared objects

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

@@@ -243,13 -207,11 +243,13 @@@ void av_register_all(void
      REGISTER_MUXDEMUX(RSO,              rso);
      REGISTER_MUXDEMUX(RTP,              rtp);
      REGISTER_MUXDEMUX(RTSP,             rtsp);
 +    REGISTER_DEMUXER (SAMI,             sami);
      REGISTER_MUXDEMUX(SAP,              sap);
 +    REGISTER_DEMUXER (SBG,              sbg);
      REGISTER_DEMUXER (SDP,              sdp);
  #if CONFIG_RTPDEC
-     av_register_rtp_dynamic_payload_handlers();
-     av_register_rdt_dynamic_payload_handlers();
+     ff_register_rtp_dynamic_payload_handlers();
+     ff_register_rdt_dynamic_payload_handlers();
  #endif
      REGISTER_DEMUXER (SEGAFILM,         segafilm);
      REGISTER_MUXER   (SEGMENT,          segment);
Simple merge
Simple merge
Simple merge
Simple merge