Always pass a AVFormatContext to av_log.

This is consistent, allows custom handlers to print more info
(since they probably know about the AVFormatContext class
but not a demuxer-specific one) and also avoids issues due
to the class pointer being NULL for non-raw mpegts.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
pull/2/head
Reimar Döffinger 14 years ago
parent 9f06c1c61e
commit 0399044805
  1. 4
      libavformat/mpegts.c

@ -640,7 +640,7 @@ static void new_pes_packet(PESContext *pes, AVPacket *pkt)
if(pes->total_size != MAX_PES_PAYLOAD && if(pes->total_size != MAX_PES_PAYLOAD &&
pes->pes_header_size + pes->data_index != pes->total_size + 6) { pes->pes_header_size + pes->data_index != pes->total_size + 6) {
av_log(pes->ts, AV_LOG_WARNING, "PES packet size mismatch\n"); av_log(pes->stream, AV_LOG_WARNING, "PES packet size mismatch\n");
pes->flags |= AV_PKT_FLAG_CORRUPT; pes->flags |= AV_PKT_FLAG_CORRUPT;
} }
memset(pkt->data+pkt->size, 0, FF_INPUT_BUFFER_PADDING_SIZE); memset(pkt->data+pkt->size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
@ -1314,7 +1314,7 @@ static int handle_packet(MpegTSContext *ts, const uint8_t *packet)
tss->last_cc = cc; tss->last_cc = cc;
if (!cc_ok) { if (!cc_ok) {
av_log(ts, AV_LOG_WARNING, "Continuity Check Failed\n"); av_log(ts->stream, AV_LOG_WARNING, "Continuity Check Failed\n");
if(tss->type == MPEGTS_PES) { if(tss->type == MPEGTS_PES) {
PESContext *pc = tss->u.pes_filter.opaque; PESContext *pc = tss->u.pes_filter.opaque;
pc->flags |= AV_PKT_FLAG_CORRUPT; pc->flags |= AV_PKT_FLAG_CORRUPT;

Loading…
Cancel
Save