diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 14:00:03 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 14:02:01 +0100 |
| commit | 0a5da9cc148b2ac7102b4a0653c38735672629f6 (patch) | |
| tree | f20d33699f6f79a2daaaaa2513bb7fcc0f396a7e /libavformat/rtpdec_formats.h | |
| parent | 950482bf587889c507340ae5893a851be8e99fcc (diff) | |
| parent | c6f1dc8e4cd967ae056698eafb891a08003c211c (diff) | |
| download | ffmpeg-0a5da9cc148b2ac7102b4a0653c38735672629f6.tar.gz | |
Merge commit 'c6f1dc8e4cd967ae056698eafb891a08003c211c'
* commit 'c6f1dc8e4cd967ae056698eafb891a08003c211c':
rtpdec: Move setting the parsing flags to the actual depacketizers
rtpdec: Split handling of mpeg12 audio/video to a separate depacketizer
Conflicts:
libavformat/rtpdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpdec_formats.h')
| -rw-r--r-- | libavformat/rtpdec_formats.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/rtpdec_formats.h b/libavformat/rtpdec_formats.h index 4221a5fc72..9caeb5c71d 100644 --- a/libavformat/rtpdec_formats.h +++ b/libavformat/rtpdec_formats.h @@ -49,6 +49,8 @@ extern RTPDynamicProtocolHandler ff_ilbc_dynamic_handler; extern RTPDynamicProtocolHandler ff_jpeg_dynamic_handler; extern RTPDynamicProtocolHandler ff_mp4a_latm_dynamic_handler; extern RTPDynamicProtocolHandler ff_mp4v_es_dynamic_handler; +extern RTPDynamicProtocolHandler ff_mpeg_audio_dynamic_handler; +extern RTPDynamicProtocolHandler ff_mpeg_video_dynamic_handler; extern RTPDynamicProtocolHandler ff_mpeg4_generic_dynamic_handler; extern RTPDynamicProtocolHandler ff_mpegts_dynamic_handler; extern RTPDynamicProtocolHandler ff_ms_rtp_asf_pfa_handler; |