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_h263.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_h263.c')
-rw-r--r-- | libavformat/rtpdec_h263.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/libavformat/rtpdec_h263.c b/libavformat/rtpdec_h263.c index ce02dc1c21..dd7aa60fd5 100644 --- a/libavformat/rtpdec_h263.c +++ b/libavformat/rtpdec_h263.c @@ -23,6 +23,14 @@ #include "rtpdec_formats.h" #include "libavutil/intreadwrite.h" +static int h263_init(AVFormatContext *ctx, int st_index, PayloadContext *data) +{ + if (st_index < 0) + return 0; + ctx->streams[st_index]->need_parsing = AVSTREAM_PARSE_FULL; + return 0; +} + int ff_h263_handle_packet(AVFormatContext *ctx, PayloadContext *data, AVStream *st, AVPacket *pkt, uint32_t *timestamp, const uint8_t *buf, int len, uint16_t seq, int flags) @@ -92,6 +100,7 @@ RTPDynamicProtocolHandler ff_h263_1998_dynamic_handler = { .enc_name = "H263-1998", .codec_type = AVMEDIA_TYPE_VIDEO, .codec_id = AV_CODEC_ID_H263, + .init = h263_init, .parse_packet = ff_h263_handle_packet, }; @@ -99,5 +108,6 @@ RTPDynamicProtocolHandler ff_h263_2000_dynamic_handler = { .enc_name = "H263-2000", .codec_type = AVMEDIA_TYPE_VIDEO, .codec_id = AV_CODEC_ID_H263, + .init = h263_init, .parse_packet = ff_h263_handle_packet, }; |