aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-09-18 14:46:40 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-09-18 14:46:50 +0200
commit27f936eca8a1703a5c203f5d2cbc76862c9219fc (patch)
tree89c9835cecd643ff1efc86682ea3cf55d059090d /libavformat
parent77f9a81ccaadb34f309dc8922e8939442e4e81aa (diff)
parent9e8be462521e1c66c5ae0f3e3fe8ece18a0fb931 (diff)
downloadffmpeg-27f936eca8a1703a5c203f5d2cbc76862c9219fc.tar.gz
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@gmx.at>
Diffstat (limited to 'libavformat')
0 files changed, 0 insertions, 0 deletions