From: Michael Niedermayer Date: Thu, 18 Sep 2014 12:46:40 +0000 (+0200) Subject: Merge branch 'postprocwork' X-Git-Tag: n2.6-dev~1439 X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/27f936eca8a1703a5c203f5d2cbc76862c9219fc Merge branch 'postprocwork' * postprocwork: postproc/postprocess: use av_strtok() postprocess: make some variables in pp_get_mode_by_name_and_quality() const postproc: simplify forwarding return codes libpostproc/postprocess: avoid some if() fate: add fate-filter-pp1 This is merged instead of just fast forward pushed due to a bug in the git hook which does not allow commits to change filter-video.mak except merge commits. filter-video.mak contains a few tabs, which are needed due to Makefile syntax Merged-by: Michael Niedermayer --- 27f936eca8a1703a5c203f5d2cbc76862c9219fc