aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2012-01-19 23:03:21 +0100
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2012-01-19 23:31:21 +0100
commit34aadeaa2c2ae2e84abde3cca0a8b1392b8294ac (patch)
tree5e8cffe7fc3152d7d5e584df09d58c306472fcfb
parentb4634a006cbff0408ce6fec0850b325eb9c51986 (diff)
downloadffmpeg-34aadeaa2c2ae2e84abde3cca0a8b1392b8294ac.tar.gz
Simplify PIX_FMT_RGB555LE selection in targa decoder.
Suggested by Jean First.
-rw-r--r--libavcodec/targa.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/targa.c b/libavcodec/targa.c
index b1bcb97e04..56e02c1b21 100644
--- a/libavcodec/targa.c
+++ b/libavcodec/targa.c
@@ -142,8 +142,6 @@ static int decode_frame(AVCodecContext *avctx,
avctx->pix_fmt = ((compr & (~TGA_RLE)) == TGA_BW) ? PIX_FMT_GRAY8 : PIX_FMT_PAL8;
break;
case 15:
- avctx->pix_fmt = PIX_FMT_RGB555LE;
- break;
case 16:
avctx->pix_fmt = PIX_FMT_RGB555LE;
break;