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_mpeg12.c | |
| parent | 4c8a556a773c9706618b8e5d14b68a06631fb79f (diff) | |
| parent | 2b982e92f42a6e661d90b12b6592cd13cae496d4 (diff) | |
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_mpeg12.c')
| -rw-r--r-- | libavformat/rtpdec_mpeg12.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/libavformat/rtpdec_mpeg12.c b/libavformat/rtpdec_mpeg12.c index d73ff1e144..e6185eafa6 100644 --- a/libavformat/rtpdec_mpeg12.c +++ b/libavformat/rtpdec_mpeg12.c @@ -23,14 +23,6 @@ #include "libavutil/intreadwrite.h" #include "rtpdec_formats.h" -static av_cold int mpeg_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; -} - static int mpeg_parse_packet(AVFormatContext *ctx, PayloadContext *data, AVStream *st, AVPacket *pkt, uint32_t *timestamp, const uint8_t *buf, int len, uint16_t seq, @@ -59,7 +51,7 @@ static int mpeg_parse_packet(AVFormatContext *ctx, PayloadContext *data, RTPDynamicProtocolHandler ff_mpeg_audio_dynamic_handler = { .codec_type = AVMEDIA_TYPE_AUDIO, .codec_id = AV_CODEC_ID_MP3, - .init = mpeg_init, + .need_parsing = AVSTREAM_PARSE_FULL, .parse_packet = mpeg_parse_packet, .static_payload_id = 14, }; @@ -67,7 +59,7 @@ RTPDynamicProtocolHandler ff_mpeg_audio_dynamic_handler = { RTPDynamicProtocolHandler ff_mpeg_video_dynamic_handler = { .codec_type = AVMEDIA_TYPE_VIDEO, .codec_id = AV_CODEC_ID_MPEG2VIDEO, - .init = mpeg_init, + .need_parsing = AVSTREAM_PARSE_FULL, .parse_packet = mpeg_parse_packet, .static_payload_id = 32, }; |