OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7ad5708
)
4xm: use the correct logging context
author
Luca Barbato
<lu_zero@gentoo.org>
Wed, 5 Jun 2013 15:12:16 +0000
(17:12 +0200)
committer
Luca Barbato
<lu_zero@gentoo.org>
Wed, 12 Jun 2013 12:45:46 +0000
(14:45 +0200)
libavcodec/4xm.c
patch
|
blob
|
history
diff --git
a/libavcodec/4xm.c
b/libavcodec/4xm.c
index
fd03134
..
71fe3f2
100644
(file)
--- a/
libavcodec/4xm.c
+++ b/
libavcodec/4xm.c
@@
-670,9
+670,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]);