[FFmpeg-cvslog] Merge branch 'postprocwork'

Michael Niedermayer git at videolan.org
Thu Sep 18 14:55:15 CEST 2014

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Sep 18 14:46:40 2014 +0200| [27f936eca8a1703a5c203f5d2cbc76862c9219fc] | committer: Michael Niedermayer

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 <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=27f936eca8a1703a5c203f5d2cbc76862c9219fc

More information about the ffmpeg-cvslog mailing list