git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
70bbeb6
)
set pix_fmt properly depending on version
author
Michael Niedermayer
<michaelni@gmx.at>
Mon, 13 Aug 2007 00:56:26 +0000
(
00:56
+0000)
committer
Michael Niedermayer
<michaelni@gmx.at>
Mon, 13 Aug 2007 00:56:26 +0000
(
00:56
+0000)
Originally committed as revision 10095 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavcodec/4xm.c
patch
|
blob
|
history
diff --git
a/libavcodec/4xm.c
b/libavcodec/4xm.c
index
aca8618
..
b82797d
100644
(file)
--- a/
libavcodec/4xm.c
+++ b/
libavcodec/4xm.c
@@
-787,7
+787,8
@@
static int decode_init(AVCodecContext *avctx){
common_init(avctx);
init_vlcs(f);
- avctx->pix_fmt= PIX_FMT_RGB565;
+ if(f->version) avctx->pix_fmt= PIX_FMT_RGB565;
+ else avctx->pix_fmt= PIX_FMT_RGB555;
return 0;
}