diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-24 17:25:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-24 17:25:34 +0200 |
| commit | e27f781aeb74e6c2b072634658a783ff8b04764b (patch) | |
| tree | 5fa779b67d849e79d6e9938835581e5d50d83fa2 /libavformat | |
| parent | 3cd252d29a152743a8ad0493b8bfcb3ccb89062c (diff) | |
| parent | c463dfc7e49929a9891884312b23b27d14729c51 (diff) | |
Merge commit 'c463dfc7e49929a9891884312b23b27d14729c51'
* commit 'c463dfc7e49929a9891884312b23b27d14729c51':
rtpdec_hevc: Drop a duplicated, nonstandard entry
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/rtpdec.c | 1 | ||||
| -rw-r--r-- | libavformat/rtpdec_formats.h | 1 | ||||
| -rw-r--r-- | libavformat/rtpdec_hevc.c | 11 |
3 files changed, 0 insertions, 13 deletions
diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c index a78af87480..7e68b4c2a6 100644 --- a/libavformat/rtpdec.c +++ b/libavformat/rtpdec.c @@ -77,7 +77,6 @@ void ff_register_rtp_dynamic_payload_handlers(void) ff_register_dynamic_payload_handler(&ff_h263_2000_dynamic_handler); ff_register_dynamic_payload_handler(&ff_h263_rfc2190_dynamic_handler); ff_register_dynamic_payload_handler(&ff_h264_dynamic_handler); - ff_register_dynamic_payload_handler(&ff_h265_dynamic_handler); ff_register_dynamic_payload_handler(&ff_hevc_dynamic_handler); ff_register_dynamic_payload_handler(&ff_ilbc_dynamic_handler); ff_register_dynamic_payload_handler(&ff_jpeg_dynamic_handler); diff --git a/libavformat/rtpdec_formats.h b/libavformat/rtpdec_formats.h index d915fabc08..803410e164 100644 --- a/libavformat/rtpdec_formats.h +++ b/libavformat/rtpdec_formats.h @@ -50,7 +50,6 @@ extern RTPDynamicProtocolHandler ff_h263_1998_dynamic_handler; extern RTPDynamicProtocolHandler ff_h263_2000_dynamic_handler; extern RTPDynamicProtocolHandler ff_h263_rfc2190_dynamic_handler; extern RTPDynamicProtocolHandler ff_h264_dynamic_handler; -extern RTPDynamicProtocolHandler ff_h265_dynamic_handler; extern RTPDynamicProtocolHandler ff_hevc_dynamic_handler; extern RTPDynamicProtocolHandler ff_ilbc_dynamic_handler; extern RTPDynamicProtocolHandler ff_jpeg_dynamic_handler; diff --git a/libavformat/rtpdec_hevc.c b/libavformat/rtpdec_hevc.c index 09160041cc..6224490768 100644 --- a/libavformat/rtpdec_hevc.c +++ b/libavformat/rtpdec_hevc.c @@ -354,17 +354,6 @@ static int hevc_handle_packet(AVFormatContext *ctx, PayloadContext *rtp_hevc_ctx } RTPDynamicProtocolHandler ff_hevc_dynamic_handler = { - .enc_name = "HEVC", - .codec_type = AVMEDIA_TYPE_VIDEO, - .codec_id = AV_CODEC_ID_HEVC, - .init = hevc_init, - .parse_sdp_a_line = hevc_parse_sdp_line, - .alloc = hevc_new_context, - .free = hevc_free_context, - .parse_packet = hevc_handle_packet -}; - -RTPDynamicProtocolHandler ff_h265_dynamic_handler = { .enc_name = "H265", .codec_type = AVMEDIA_TYPE_VIDEO, .codec_id = AV_CODEC_ID_HEVC, |