diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-24 22:34:04 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-24 22:34:08 +0100 |
commit | 11fb6258582d31bebf50ae02fbc301bbac613c2d (patch) | |
tree | b5cae1ed6d5763aabdb4d7418484de8a516afb22 /libavformat/rtpdec_mpeg4.c | |
parent | 4c8a556a773c9706618b8e5d14b68a06631fb79f (diff) | |
parent | 2b982e92f42a6e661d90b12b6592cd13cae496d4 (diff) | |
download | ffmpeg-11fb6258582d31bebf50ae02fbc301bbac613c2d.tar.gz |
Merge commit '2b982e92f42a6e661d90b12b6592cd13cae496d4'
* commit '2b982e92f42a6e661d90b12b6592cd13cae496d4':
rtpdec: Set need_parsing via a handler field
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpdec_mpeg4.c')
-rw-r--r-- | libavformat/rtpdec_mpeg4.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/libavformat/rtpdec_mpeg4.c b/libavformat/rtpdec_mpeg4.c index ffa622f368..da58c032f2 100644 --- a/libavformat/rtpdec_mpeg4.c +++ b/libavformat/rtpdec_mpeg4.c @@ -320,20 +320,11 @@ static int parse_sdp_line(AVFormatContext *s, int st_index, return 0; } -static av_cold 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, + .need_parsing = AVSTREAM_PARSE_FULL, .parse_sdp_a_line = parse_sdp_line, }; |