diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-10 12:41:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-10 12:41:06 +0200 |
| commit | 0594ef0deab75ad1fdf92548b907079659ce50f5 (patch) | |
| tree | 0d879a36db6b0d0c466cda49ff04a1dd1fd1899f /libavcodec/webvttdec.c | |
| parent | 2a7f885fe1cfaaefe35252d68366d0d5709cd745 (diff) | |
| parent | b439c992c23f3e0f3832fffd2a34a664b236c525 (diff) | |
| download | ffmpeg-0594ef0deab75ad1fdf92548b907079659ce50f5.tar.gz | |
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@gmx.at>
Diffstat (limited to 'libavcodec/webvttdec.c')
0 files changed, 0 insertions, 0 deletions