Merge commit '0de07510844517b615ef2a2e2916f6391ad88687'

* commit '0de07510844517b615ef2a2e2916f6391ad88687':
  rtpdec_h264: Make reusable functions non-static

Conflicts:
	libavformat/rtpdec_formats.h
	libavformat/rtpdec_h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavformat/rtpdec_formats.h
index 5849d8c,47b89e8..0d216ad
--- 1/libavformat/rtpdec_formats.h
--- 2/libavformat/rtpdec_formats.h
+++ b/libavformat/rtpdec_formats.h
@@@ -35,10 -35,16 +35,18 @@@ int ff_h263_handle_packet(AVFormatConte
                            AVStream *st, AVPacket *pkt, uint32_t *timestamp,
                            const uint8_t *buf, int len, uint16_t seq, int flags);
  
 -int ff_h264_handle_aggregated_packet(AVFormatContext *ctx, AVPacket *pkt,
+ int ff_h264_parse_sprop_parameter_sets(AVFormatContext *s,
+                                        uint8_t **data_ptr, int *size_ptr,
+                                        const char *value);
++int ff_h264_handle_aggregated_packet(AVFormatContext *ctx, PayloadContext *data, AVPacket *pkt,
+                                      const uint8_t *buf, int len,
+                                      int start_skip, int *nal_counters,
+                                      int nal_mask);
+ 
 +extern RTPDynamicProtocolHandler ff_ac3_dynamic_handler;
  extern RTPDynamicProtocolHandler ff_amr_nb_dynamic_handler;
  extern RTPDynamicProtocolHandler ff_amr_wb_dynamic_handler;
 +extern RTPDynamicProtocolHandler ff_dv_dynamic_handler;
  extern RTPDynamicProtocolHandler ff_g726_16_dynamic_handler;
  extern RTPDynamicProtocolHandler ff_g726_24_dynamic_handler;
  extern RTPDynamicProtocolHandler ff_g726_32_dynamic_handler;

diff --cc libavformat/rtpdec_h264.c
index 1062439,e781b36..15e914a
--- 1/libavformat/rtpdec_h264.c
--- 2/libavformat/rtpdec_h264.c
+++ b/libavformat/rtpdec_h264.c
@@@ -179,7 -179,7 +179,7 @@@ static int sdp_parse_fmtp_config_h264(A
      return 0;
  }
  
- static int h264_handle_packet_stap_a(AVFormatContext *ctx, PayloadContext *data, AVPacket *pkt,
 -int ff_h264_handle_aggregated_packet(AVFormatContext *ctx, AVPacket *pkt,
++int ff_h264_handle_aggregated_packet(AVFormatContext *ctx, PayloadContext *data, AVPacket *pkt,
                                       const uint8_t *buf, int len,
                                       int start_skip, int *nal_counters,
                                       int nal_mask)
@@@ -315,8 -315,8 +315,8 @@@ static int h264_handle_packet(AVFormatC
          // consume the STAP-A NAL
          buf++;
          len--;
-         result = h264_handle_packet_stap_a(ctx, data, pkt, buf, len, 0,
-                                            NAL_COUNTERS, NAL_MASK);
 -        result = ff_h264_handle_aggregated_packet(ctx, pkt, buf, len, 0,
++        result = ff_h264_handle_aggregated_packet(ctx, data, pkt, buf, len, 0,
+                                                   NAL_COUNTERS, NAL_MASK);
          break;
  
      case 25:                   // STAP-B