diff --git a/libavcodec/targaenc.c b/libavcodec/targaenc.c
index 27c28d2a589acfc3d4d2192dab0b7d7ed583d91f..e29e3b411df84bb0136e309ef941b1ce0d80eaa0 100644
--- a/libavcodec/targaenc.c
+++ b/libavcodec/targaenc.c
@@ -46,13 +46,18 @@ static int targa_encode_frame(AVCodecContext *avctx,
     AV_WL16(outbuf+14, avctx->height);
     outbuf[17] = 0x20;           /* origin is top-left. no alpha */
 
-    /* TODO: support alpha channel and other bit-depths.  and RLE? */
+    /* TODO: support alpha channel and RLE */
     switch(avctx->pix_fmt) {
     case PIX_FMT_GRAY8:
         outbuf[2] = 3;           /* uncompressed grayscale image */
         outbuf[16] = 8;          /* bpp */
         n = avctx->width;
         break;
+    case PIX_FMT_RGB555:
+        outbuf[2] = 2;           /* uncompresses true-color image */
+        outbuf[16] = 16;         /* bpp */
+        n = 2 * avctx->width;
+        break;
     case PIX_FMT_BGR24:
         outbuf[2] = 2;           /* uncompressed true-color image */
         outbuf[16] = 24;         /* bpp */
@@ -92,5 +97,5 @@ AVCodec targa_encoder = {
     .priv_data_size = 0,
     .init = targa_encode_init,
     .encode = targa_encode_frame,
-    .pix_fmts= (enum PixelFormat[]){PIX_FMT_BGR24, PIX_FMT_GRAY8, -1},
+    .pix_fmts= (enum PixelFormat[]){PIX_FMT_BGR24, PIX_FMT_RGB555, PIX_FMT_GRAY8, -1},
 };