summaryrefslogtreecommitdiff
path: root/ffmpeg/libpostproc/postprocess.c
diff options
context:
space:
mode:
Diffstat (limited to 'ffmpeg/libpostproc/postprocess.c')
-rw-r--r--ffmpeg/libpostproc/postprocess.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/ffmpeg/libpostproc/postprocess.c b/ffmpeg/libpostproc/postprocess.c
index facfd2c..da586ff 100644
--- a/ffmpeg/libpostproc/postprocess.c
+++ b/ffmpeg/libpostproc/postprocess.c
@@ -666,7 +666,7 @@ pp_mode *pp_get_mode_by_name_and_quality(const char *name, int quality)
char temp[GET_MODE_BUFFER_SIZE];
char *p= temp;
static const char filterDelimiters[] = ",/";
- static const char optionDelimiters[] = ":";
+ static const char optionDelimiters[] = ":|";
struct PPMode *ppMode;
char *filterToken;
@@ -719,6 +719,10 @@ pp_mode *pp_get_mode_by_name_and_quality(const char *name, int quality)
if(filterToken == NULL) break;
p+= strlen(filterToken) + 1; // p points to next filterToken
filterName= strtok(filterToken, optionDelimiters);
+ if (filterName == NULL) {
+ ppMode->error++;
+ break;
+ }
av_log(NULL, AV_LOG_DEBUG, "pp: %s::%s\n", filterToken, filterName);
if(*filterName == '-'){