virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-06-04 05:57:49 +02:00
Code Issues Releases Activity

libx264.c: distinguish between x264 parameter errors.

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Erik Slagter 2011-07-18 20:04:15 +02:00 committed by Michael Niedermayer
parent d303e0affd
commit 045ef52ef5
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libavcodec/libx264.c
View File

@ -198,14 +198,19 @@ static void check_default_settings(AVCodecContext *avctx)
} }
} }
#define OPT_STR(opt, param) \ #define OPT_STR(opt, param) \
do { \ do { \
if (param && x264_param_parse(&x4->params, opt, param) < 0) { \ int ret; \
av_log(avctx, AV_LOG_ERROR, \ if (param && (ret = x264_param_parse(&x4->params, opt, param)) < 0) { \
"bad value for '%s': '%s'\n", opt, param); \ if(ret == X264_PARAM_BAD_NAME) \
return -1; \ av_log(avctx, AV_LOG_ERROR, \
} \ "bad option '%s': '%s'\n", opt, param); \
} while (0); \ else \
av_log(avctx, AV_LOG_ERROR, \
"bad value for '%s': '%s'\n", opt, param); \
return -1; \
} \
} while (0);
static av_cold int X264_init(AVCodecContext *avctx) static av_cold int X264_init(AVCodecContext *avctx)
{ {