diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-13 09:41:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-13 09:41:45 +0200 |
| commit | 5c3e5651dd88af5da86ef08f01e865bfdea36a3a (patch) | |
| tree | 68b75a2086167ae33763d33e522cc82c763c41ef | |
| parent | 443b29e475a63cbfc573bddf46c4cb5ce7b5f461 (diff) | |
| parent | 08859d19b429c522d6494c186656f4a2d3ff8e21 (diff) | |
| download | ffmpeg-5c3e5651dd88af5da86ef08f01e865bfdea36a3a.tar.gz | |
Merge commit '08859d19b429c522d6494c186656f4a2d3ff8e21'
* commit '08859d19b429c522d6494c186656f4a2d3ff8e21':
4xm: use the correct logging context
g2meet: Fix a typo in the height comparison
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/4xm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c index d2c90ac5c0..18b1fe9756 100644 --- a/libavcodec/4xm.c +++ b/libavcodec/4xm.c @@ -711,9 +711,9 @@ static int decode_i2_frame(FourXContext *f, AVFrame *frame, const uint8_t *buf, color[1] = bytestream2_get_le16u(&g3); if (color[0] & 0x8000) - av_log(NULL, AV_LOG_ERROR, "unk bit 1\n"); + av_log(f->avctx, AV_LOG_ERROR, "unk bit 1\n"); if (color[1] & 0x8000) - av_log(NULL, AV_LOG_ERROR, "unk bit 2\n"); + av_log(f->avctx, AV_LOG_ERROR, "unk bit 2\n"); color[2] = mix(color[0], color[1]); color[3] = mix(color[1], color[0]); |