[FFmpeg-cvslog] targa: use named constants for flag values

Bobby Bingham git at videolan.org
Tue Oct 9 05:54:12 CEST 2012


ffmpeg | branch: master | Bobby Bingham <uhmmmm at gmail.com> | Sun Oct  7 23:59:59 2012 -0500| [3d9cdfdce76a121945c3626a66739f47a055e103] | committer: Bobby Bingham

targa: use named constants for flag values

Signed-off-by: Bobby Bingham <uhmmmm at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3d9cdfdce76a121945c3626a66739f47a055e103
---

 libavcodec/targa.c |    4 ++--
 libavcodec/targa.h |    5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/libavcodec/targa.c b/libavcodec/targa.c
index 8cef685..b168957 100644
--- a/libavcodec/targa.c
+++ b/libavcodec/targa.c
@@ -166,7 +166,7 @@ static int decode_frame(AVCodecContext *avctx,
         av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
         return -1;
     }
-    if(flags & 0x20){
+    if(flags & TGA_TOPTOBOTTOM) {
         dst = p->data[0];
         stride = p->linesize[0];
     }else{ //image is upside-down
@@ -247,7 +247,7 @@ static int decode_frame(AVCodecContext *avctx,
             }
         }
     }
-    if(flags & 0x10){ // right-to-left, needs horizontal flip
+    if(flags & TGA_RIGHTTOLEFT) { // right-to-left, needs horizontal flip
         int x;
         for(y = 0; y < h; y++){
             void *line = &p->data[0][y * p->linesize[0]];
diff --git a/libavcodec/targa.h b/libavcodec/targa.h
index 158a5ea..2f2e382 100644
--- a/libavcodec/targa.h
+++ b/libavcodec/targa.h
@@ -38,4 +38,9 @@ enum TargaCompr {
     TGA_RLE    = 8, // flag pointing that data is RLE-coded
 };
 
+enum TargaFlags {
+    TGA_RIGHTTOLEFT = 0x10, // right-to-left (flipped horizontally)
+    TGA_TOPTOBOTTOM = 0x20, // top-to-bottom (NOT flipped vertically)
+};
+
 #endif /* AVCODEC_TARGA_H */



More information about the ffmpeg-cvslog mailing list