virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +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
Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/libx264.c
View File

@@ -200,12 +200,17 @@ 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; \
if (param && (ret = x264_param_parse(&x4->params, opt, param)) < 0) { \
if(ret == X264_PARAM_BAD_NAME) \
av_log(avctx, AV_LOG_ERROR, \
"bad option '%s': '%s'\n", opt, param); \
else \
av_log(avctx, AV_LOG_ERROR, \ av_log(avctx, AV_LOG_ERROR, \
"bad value for '%s': '%s'\n", opt, param); \ "bad value for '%s': '%s'\n", opt, param); \
return -1; \ return -1; \
} \ } \
} while (0); \ } while (0);
static av_cold int X264_init(AVCodecContext *avctx) static av_cold int X264_init(AVCodecContext *avctx)
{ {