diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 17:00:03 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 17:02:01 +0400 |
commit | 0a5da9cc148b2ac7102b4a0653c38735672629f6 (patch) | |
tree | f20d33699f6f79a2daaaaa2513bb7fcc0f396a7e /libavformat/rtpdec_mpeg4.c | |
parent | 950482bf587889c507340ae5893a851be8e99fcc (diff) | |
parent | c6f1dc8e4cd967ae056698eafb891a08003c211c (diff) |
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_mpeg4.c')
-rw-r--r-- | libavformat/rtpdec_mpeg4.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/libavformat/rtpdec_mpeg4.c b/libavformat/rtpdec_mpeg4.c index 2736316742..3f1f244b83 100644 --- a/libavformat/rtpdec_mpeg4.c +++ b/libavformat/rtpdec_mpeg4.c @@ -252,10 +252,19 @@ static int parse_sdp_line(AVFormatContext *s, int st_index, return 0; } +static int init_video(AVFormatContext *s, int st_index, PayloadContext *data) +{ + if (st_index < 0) + return 0; + s->streams[st_index]->need_parsing = AVSTREAM_PARSE_FULL; + return 0; +} + RTPDynamicProtocolHandler ff_mp4v_es_dynamic_handler = { .enc_name = "MP4V-ES", .codec_type = AVMEDIA_TYPE_VIDEO, .codec_id = AV_CODEC_ID_MPEG4, + .init = init_video, .parse_sdp_a_line = parse_sdp_line, }; |