aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/pixdesc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-04-10 19:21:59 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-04-10 19:21:59 +0200
commit81c1ed748be53da95c2dbda4e16794afcf0851b3 (patch)
tree243ace87a2748ac60899bc7491901e3a2e03fa3c /libavutil/pixdesc.c
parentb8a1f8b4e28b4ff85aae8fdedf586d60f0514118 (diff)
parentf13ab29925883b4245da4129694af3af378d67be (diff)
downloadffmpeg-81c1ed748be53da95c2dbda4e16794afcf0851b3.tar.gz
Merge commit 'f13ab29925883b4245da4129694af3af378d67be'
* commit 'f13ab29925883b4245da4129694af3af378d67be': vf_fps: switch to an AVOptions-based system. Conflicts: libavfilter/vf_fps.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/pixdesc.c')
0 files changed, 0 insertions, 0 deletions