X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=blobdiff_plain;f=libavformat%2Frtpdec_h263.c;h=b3714910ebeedc00590efe1773eab9556da9b647;hp=ea42fff3205b7287baf713bd578a17981bd503ea;hb=7abd35a1ffaecfd79fa07b801621ee11ab595c43;hpb=965a3ddb1f9cd03f04c631437479460e1a0bdec1 diff --git a/libavformat/rtpdec_h263.c b/libavformat/rtpdec_h263.c index ea42fff320..b3714910eb 100644 --- a/libavformat/rtpdec_h263.c +++ b/libavformat/rtpdec_h263.c @@ -2,34 +2,40 @@ * RTP H.263 Depacketizer, RFC 4629 * Copyright (c) 2010 Martin Storsjo * - * This file is part of FFmpeg. + * This file is part of Libav. * - * FFmpeg is free software; you can redistribute it and/or + * Libav is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * FFmpeg is distributed in the hope that it will be useful, + * Libav is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software + * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "avformat.h" #include "rtpdec_formats.h" +#include "libavutil/attributes.h" #include "libavutil/intreadwrite.h" -static int h263_handle_packet(AVFormatContext *ctx, - PayloadContext *data, - AVStream *st, - AVPacket * pkt, - uint32_t * timestamp, - const uint8_t * buf, - int len, int flags) +static av_cold 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) { uint8_t *ptr; uint16_t header; @@ -95,14 +101,15 @@ static int h263_handle_packet(AVFormatContext *ctx, RTPDynamicProtocolHandler ff_h263_1998_dynamic_handler = { .enc_name = "H263-1998", .codec_type = AVMEDIA_TYPE_VIDEO, - .codec_id = CODEC_ID_H263, - .parse_packet = h263_handle_packet, + .codec_id = AV_CODEC_ID_H263, + .init = h263_init, + .parse_packet = ff_h263_handle_packet, }; RTPDynamicProtocolHandler ff_h263_2000_dynamic_handler = { .enc_name = "H263-2000", .codec_type = AVMEDIA_TYPE_VIDEO, - .codec_id = CODEC_ID_H263, - .parse_packet = h263_handle_packet, + .codec_id = AV_CODEC_ID_H263, + .init = h263_init, + .parse_packet = ff_h263_handle_packet, }; -