[FFmpeg-cvslog] 4xm: use the correct logging context
Luca Barbato
git at videolan.org
Mon Jul 29 04:01:56 CEST 2013
ffmpeg | branch: release/0.10 | Luca Barbato <lu_zero at gentoo.org> | Wed Jun 5 17:12:16 2013 +0200| [284ac9191b755ffce1475687b597a8a738d511c6] | committer: Reinhard Tartler
4xm: use the correct logging context
(cherry picked from commit 08859d19b429c522d6494c186656f4a2d3ff8e21)
Signed-off-by: Luca Barbato <lu_zero at gentoo.org>
Conflicts:
libavcodec/4xm.c
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=284ac9191b755ffce1475687b597a8a738d511c6
---
libavcodec/4xm.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c
index efaf939..735cfcf 100644
--- a/libavcodec/4xm.c
+++ b/libavcodec/4xm.c
@@ -633,8 +633,8 @@ static int decode_i2_frame(FourXContext *f, const uint8_t *buf, int length){
color[0]= bytestream2_get_le16u(&g3);
color[1]= bytestream2_get_le16u(&g3);
- if(color[0]&0x8000) av_log(NULL, AV_LOG_ERROR, "unk bit 1\n");
- if(color[1]&0x8000) av_log(NULL, AV_LOG_ERROR, "unk bit 2\n");
+ if(color[0]&0x8000) av_log(f->avctx, AV_LOG_ERROR, "unk bit 1\n");
+ if(color[1]&0x8000) 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]);
More information about the ffmpeg-cvslog
mailing list