summaryrefslogtreecommitdiff
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2010-06-03 18:40:31 +0000
committerStefano Sabatini <stefano.sabatini-lala@poste.it>2010-06-03 18:40:31 +0000
commit83a36b2e0b6f7b568486a627a3da3f9fdffc6a61 (patch)
treed23dde893da6f61dc75bc72d22ad4e85ee2ca1d7 /ffmpeg.c
parent48790d8ba89d18150e70e2889f891df2ed2ae405 (diff)
Change type of {audio,video,subtitle}_codec_tag variables from int to
unsigned int, as the corresponding variable set in AVCodecContext.codec_tag is unsigned int. Originally committed as revision 23441 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index bf57883f31..b0722a414d 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -139,7 +139,7 @@ static const char *video_rc_override_string=NULL;
static int video_disable = 0;
static int video_discard = 0;
static char *video_codec_name = NULL;
-static int video_codec_tag = 0;
+static unsigned int video_codec_tag = 0;
static char *video_language = NULL;
static int same_quality = 0;
static int do_deinterlace = 0;
@@ -162,13 +162,13 @@ static float audio_qscale = QSCALE_NONE;
static int audio_disable = 0;
static int audio_channels = 1;
static char *audio_codec_name = NULL;
-static int audio_codec_tag = 0;
+static unsigned int audio_codec_tag = 0;
static char *audio_language = NULL;
static int subtitle_disable = 0;
static char *subtitle_codec_name = NULL;
static char *subtitle_language = NULL;
-static int subtitle_codec_tag = 0;
+static unsigned int subtitle_codec_tag = 0;
static float mux_preload= 0.5;
static float mux_max_delay= 0.7;