virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity

ffmpeg: fix opt_codec_tag() return value

Browse Source 
opt_codec_tag() is now used under OPT_FUNC2, which must return a value.

Originally committed as revision 25616 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Ramiro Polla 2010-10-31 19:55:13 +00:00
parent 153ca56b38
commit 0d0778b060
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ffmpeg.c
View File

@ -2855,7 +2855,7 @@ static void opt_subtitle_codec(const char *arg)
opt_codec(&subtitle_stream_copy, &subtitle_codec_name, AVMEDIA_TYPE_SUBTITLE, arg); opt_codec(&subtitle_stream_copy, &subtitle_codec_name, AVMEDIA_TYPE_SUBTITLE, arg);
} }
static void opt_codec_tag(const char *opt, const char *arg) static int opt_codec_tag(const char *opt, const char *arg)
{ {
char *tail; char *tail;
uint32_t *codec_tag; uint32_t *codec_tag;
@ -2863,10 +2863,14 @@ static void opt_codec_tag(const char *opt, const char *arg)
codec_tag = !strcmp(opt, "atag") ? &audio_codec_tag : codec_tag = !strcmp(opt, "atag") ? &audio_codec_tag :
!strcmp(opt, "vtag") ? &video_codec_tag : !strcmp(opt, "vtag") ? &video_codec_tag :
!strcmp(opt, "stag") ? &subtitle_codec_tag : NULL; !strcmp(opt, "stag") ? &subtitle_codec_tag : NULL;
if (!codec_tag)
return -1;
*codec_tag = strtol(arg, &tail, 0); *codec_tag = strtol(arg, &tail, 0);
if (!tail || *tail) if (!tail || *tail)
*codec_tag = arg[0] + (arg[1]<<8) + (arg[2]<<16) + (arg[3]<<24); *codec_tag = arg[0] + (arg[1]<<8) + (arg[2]<<16) + (arg[3]<<24);
return 0;
} }
static void opt_map(const char *arg) static void opt_map(const char *arg)