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_xiph.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_xiph.c')
| -rw-r--r-- | libavformat/rtpdec_xiph.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/libavformat/rtpdec_xiph.c b/libavformat/rtpdec_xiph.c index 6712b78631..7b9ea9e442 100644 --- a/libavformat/rtpdec_xiph.c +++ b/libavformat/rtpdec_xiph.c @@ -71,15 +71,6 @@ static void xiph_free_context(PayloadContext * data) av_freep(&data); } -static av_cold int xiph_vorbis_init(AVFormatContext *ctx, int st_index, - PayloadContext *data) -{ - if (st_index < 0) - return 0; - ctx->streams[st_index]->need_parsing = AVSTREAM_PARSE_HEADERS; - return 0; -} - static int xiph_handle_packet(AVFormatContext *ctx, PayloadContext *data, AVStream *st, AVPacket *pkt, uint32_t *timestamp, @@ -404,7 +395,7 @@ RTPDynamicProtocolHandler ff_vorbis_dynamic_handler = { .enc_name = "vorbis", .codec_type = AVMEDIA_TYPE_AUDIO, .codec_id = AV_CODEC_ID_VORBIS, - .init = xiph_vorbis_init, + .need_parsing = AVSTREAM_PARSE_HEADERS, .parse_sdp_a_line = xiph_parse_sdp_line, .alloc = xiph_new_context, .free = xiph_free_context, |