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_h261.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_h261.c')
| -rw-r--r-- | libavformat/rtpdec_h261.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/libavformat/rtpdec_h261.c b/libavformat/rtpdec_h261.c index 9f3488931b..c1f9cf4c08 100644 --- a/libavformat/rtpdec_h261.c +++ b/libavformat/rtpdec_h261.c @@ -60,17 +60,6 @@ static av_cold void h261_free_context(PayloadContext *pl_ctx) av_free(pl_ctx); } -static av_cold int h261_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 h261_handle_packet(AVFormatContext *ctx, PayloadContext *rtp_h261_ctx, AVStream *st, AVPacket *pkt, uint32_t *timestamp, const uint8_t *buf, int len, uint16_t seq, @@ -194,7 +183,7 @@ RTPDynamicProtocolHandler ff_h261_dynamic_handler = { .enc_name = "H261", .codec_type = AVMEDIA_TYPE_VIDEO, .codec_id = AV_CODEC_ID_H261, - .init = h261_init, + .need_parsing = AVSTREAM_PARSE_FULL, .alloc = h261_new_context, .free = h261_free_context, .parse_packet = h261_handle_packet, |