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_h264.c | |
| 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_h264.c')
| -rw-r--r-- | libavformat/rtpdec_h264.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/libavformat/rtpdec_h264.c b/libavformat/rtpdec_h264.c index 2cab9c917c..d1133b78e1 100644 --- a/libavformat/rtpdec_h264.c +++ b/libavformat/rtpdec_h264.c @@ -338,6 +338,14 @@ static void h264_free_context(PayloadContext *data) av_free(data); } +static int h264_init(AVFormatContext *s, int st_index, PayloadContext *data) +{ + if (st_index < 0) + return 0; + s->streams[st_index]->need_parsing = AVSTREAM_PARSE_FULL; + return 0; +} + static int parse_h264_sdp_line(AVFormatContext *s, int st_index, PayloadContext *h264_data, const char *line) { @@ -383,6 +391,7 @@ RTPDynamicProtocolHandler ff_h264_dynamic_handler = { .enc_name = "H264", .codec_type = AVMEDIA_TYPE_VIDEO, .codec_id = AV_CODEC_ID_H264, + .init = h264_init, .parse_sdp_a_line = parse_h264_sdp_line, .alloc = h264_new_context, .free = h264_free_context, |