diff options
| author | Clément Bœsch <clement@stupeflix.com> | 2016-06-20 10:30:08 +0200 |
|---|---|---|
| committer | Clément Bœsch <clement@stupeflix.com> | 2016-06-20 10:36:16 +0200 |
| commit | 38a2d9aeec083000d3bf14f94a2b4effd8ae2769 (patch) | |
| tree | a5010dd2cada270b021b5694b96ba4e0587e5133 /libavcodec/h264_parser.c | |
| parent | 4fdea02d688cbe9a66db684b178180367cd5eb1b (diff) | |
| download | ffmpeg-38a2d9aeec083000d3bf14f94a2b4effd8ae2769.tar.gz | |
lavc/h264_parser: replace AVCodecContext with logging ctx in scan_mmco_reset()
Diffstat (limited to 'libavcodec/h264_parser.c')
| -rw-r--r-- | libavcodec/h264_parser.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c index 7dde3d54f7..3ce049ee56 100644 --- a/libavcodec/h264_parser.c +++ b/libavcodec/h264_parser.c @@ -149,7 +149,7 @@ found: } static int scan_mmco_reset(AVCodecParserContext *s, GetBitContext *gb, - AVCodecContext *avctx) + void *logctx) { H264PredWeightTable pwt; int slice_type_nos = s->pict_type & 3; @@ -164,7 +164,7 @@ static int scan_mmco_reset(AVCodecParserContext *s, GetBitContext *gb, get_bits1(gb); // direct_spatial_mv_pred if (ff_h264_parse_ref_count(&list_count, ref_count, gb, p->ps.pps, - slice_type_nos, p->picture_structure, avctx) < 0) + slice_type_nos, p->picture_structure, logctx) < 0) return AVERROR_INVALIDDATA; if (slice_type_nos != AV_PICTURE_TYPE_I) { @@ -178,7 +178,7 @@ static int scan_mmco_reset(AVCodecParserContext *s, GetBitContext *gb, if (reordering_of_pic_nums_idc < 3) get_ue_golomb_long(gb); else if (reordering_of_pic_nums_idc > 3) { - av_log(avctx, AV_LOG_ERROR, + av_log(logctx, AV_LOG_ERROR, "illegal reordering_of_pic_nums_idc %d\n", reordering_of_pic_nums_idc); return AVERROR_INVALIDDATA; @@ -186,7 +186,7 @@ static int scan_mmco_reset(AVCodecParserContext *s, GetBitContext *gb, break; if (index >= ref_count[list]) { - av_log(avctx, AV_LOG_ERROR, + av_log(logctx, AV_LOG_ERROR, "reference count %d overflow\n", index); return AVERROR_INVALIDDATA; } @@ -198,14 +198,14 @@ static int scan_mmco_reset(AVCodecParserContext *s, GetBitContext *gb, if ((p->ps.pps->weighted_pred && slice_type_nos == AV_PICTURE_TYPE_P) || (p->ps.pps->weighted_bipred_idc == 1 && slice_type_nos == AV_PICTURE_TYPE_B)) ff_h264_pred_weight_table(gb, p->ps.sps, ref_count, slice_type_nos, - &pwt, avctx); + &pwt, logctx); if (get_bits1(gb)) { // adaptive_ref_pic_marking_mode_flag int i; for (i = 0; i < MAX_MMCO_COUNT; i++) { MMCOOpcode opcode = get_ue_golomb_31(gb); if (opcode > (unsigned) MMCO_LONG) { - av_log(avctx, AV_LOG_ERROR, + av_log(logctx, AV_LOG_ERROR, "illegal memory management control operation %d\n", opcode); return AVERROR_INVALIDDATA; |