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/rtpdec.c | |
| parent | 3cd252d29a152743a8ad0493b8bfcb3ccb89062c (diff) | |
| parent | c463dfc7e49929a9891884312b23b27d14729c51 (diff) | |
| download | ffmpeg-e27f781aeb74e6c2b072634658a783ff8b04764b.tar.gz | |
Merge commit 'c463dfc7e49929a9891884312b23b27d14729c51'
* commit 'c463dfc7e49929a9891884312b23b27d14729c51':
rtpdec_hevc: Drop a duplicated, nonstandard entry
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpdec.c')
| -rw-r--r-- | libavformat/rtpdec.c | 1 |
1 files changed, 0 insertions, 1 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); |