[SCM] libav/experimental: Use enum CodecID instead of int. Fixes the following icc warning: warning #188: enumerated type mixed with another type

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:48:33 UTC 2013


The following commit has been merged in the experimental branch:
commit 340e2303924db326817c5b47a9424623ac1401f1
Author: Carl Eugen Hoyos <cehoyos at rainbow.studorg.tuwien.ac.at>
Date:   Sat Jul 4 08:18:03 2009 +0000

    Use enum CodecID instead of int.
    Fixes the following icc warning:
    warning #188: enumerated type mixed with another type
    
    Originally committed as revision 19340 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/ffmpeg.c b/ffmpeg.c
index 18bf949..22bfed8 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -3051,7 +3051,7 @@ static void new_video_stream(AVFormatContext *oc)
 {
     AVStream *st;
     AVCodecContext *video_enc;
-    int codec_id;
+    enum CodecID codec_id;
 
     st = av_new_stream(oc, oc->nb_streams);
     if (!st) {
@@ -3193,7 +3193,7 @@ static void new_audio_stream(AVFormatContext *oc)
 {
     AVStream *st;
     AVCodecContext *audio_enc;
-    int codec_id;
+    enum CodecID codec_id;
 
     st = av_new_stream(oc, oc->nb_streams);
     if (!st) {

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list