[SCM] libav/experimental: Use AV_RL32() in opt_codec_tag().

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:18:23 UTC 2013


The following commit has been merged in the experimental branch:
commit 2839dc974d8cf4155b0a8ddd8983f17abcff405e
Author: Stefano Sabatini <stefano.sabatini-lala at poste.it>
Date:   Sun Oct 31 22:48:44 2010 +0000

    Use AV_RL32() in opt_codec_tag().
    
    Originally committed as revision 25618 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/ffmpeg.c b/ffmpeg.c
index 7ad055d..edea4fd 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -39,6 +39,7 @@
 #include "libavcore/parseutils.h"
 #include "libavutil/colorspace.h"
 #include "libavutil/fifo.h"
+#include "libavutil/intreadwrite.h"
 #include "libavutil/pixdesc.h"
 #include "libavutil/avstring.h"
 #include "libavutil/libm.h"
@@ -2868,7 +2869,7 @@ static int opt_codec_tag(const char *opt, const char *arg)
 
     *codec_tag = strtol(arg, &tail, 0);
     if (!tail || *tail)
-        *codec_tag = arg[0] + (arg[1]<<8) + (arg[2]<<16) + (arg[3]<<24);
+        *codec_tag = AV_RL32(arg);
 
     return 0;
 }

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list