[FFmpeg-cvslog] Merge commit 'b439c992c23f3e0f3832fffd2a34a664b236c525'
Michael Niedermayer
git at videolan.org
Wed Apr 10 12:55:38 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 10 12:41:06 2013 +0200| [0594ef0deab75ad1fdf92548b907079659ce50f5] | committer: Michael Niedermayer
Merge commit 'b439c992c23f3e0f3832fffd2a34a664b236c525'
* commit 'b439c992c23f3e0f3832fffd2a34a664b236c525':
lavfi: switch to an AVOptions-based system.
dfa: implement missing TDLT coding method
Conflicts:
libavcodec/dfa.c
libavfilter/avfilter.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0594ef0deab75ad1fdf92548b907079659ce50f5
---
More information about the ffmpeg-cvslog
mailing list