summaryrefslogtreecommitdiff
path: root/libavcodec/4xm.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2007-08-13 00:56:26 +0000
committerMichael Niedermayer <michaelni@gmx.at>2007-08-13 00:56:26 +0000
commitcf786021a6c76a10f6e3453e01ac43c2fad28ac4 (patch)
tree097de1bd10ecea14d56123d3e53343c8ea13b976 /libavcodec/4xm.c
parent70bbeb6fbfc452415384d8f136e59be63fe1e248 (diff)
downloadffmpeg-cf786021a6c76a10f6e3453e01ac43c2fad28ac4.tar.gz
set pix_fmt properly depending on version
Originally committed as revision 10095 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/4xm.c')
-rw-r--r--libavcodec/4xm.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c
index aca86181ba..b82797d493 100644
--- 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;
}