diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2014-09-17 13:27:32 +0100 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2014-09-24 10:44:14 +0300 |
| commit | c463dfc7e49929a9891884312b23b27d14729c51 (patch) | |
| tree | c4aee252bdb23dbab477af779f6ab67192b585c3 | |
| parent | 103391ca90b2f7c56ae756d76c76f7c3dfa28dd4 (diff) | |
| download | ffmpeg-c463dfc7e49929a9891884312b23b27d14729c51.tar.gz | |
rtpdec_hevc: Drop a duplicated, nonstandard entry
The RFC spec draft only specifies the "H265" name - there is no
specification saying how to interpret "HEVC" (if such a packet
format is specified it could be an entirely different format).
Since this is a very new standard (still a draft), there is little
need for compatibility with existing, broken implementations. Therefore
remove the extra alias, to avoid the risk of encouraging incorrect
usage.
Intentionally keeping the ff_hevc_dynamic_handler name for the
handler, to use "hevc" consistently as name for the codec instead
of "h265" within the library internals as long as there only is one
single variant in actual use.
Signed-off-by: Martin Storsjö <martin@martin.st>
| -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 d6421d0a21..76228be48d 100644 --- a/libavformat/rtpdec.c +++ b/libavformat/rtpdec.c @@ -70,7 +70,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 956c6cbae0..02335edaf3 100644 --- a/libavformat/rtpdec_formats.h +++ b/libavformat/rtpdec_formats.h @@ -45,7 +45,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 aea3f381d3..0ff30e22eb 100644 --- a/libavformat/rtpdec_hevc.c +++ b/libavformat/rtpdec_hevc.c @@ -350,17 +350,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, |