diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-16 08:48:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-16 08:48:45 +0100 |
| commit | fab8a89abeae6bab5d2556d0116ca270ff6da5ed (patch) | |
| tree | c70e631310ab2396ed0cba17293fea0258163792 /libavcodec/ffv1dec.c | |
| parent | b9c544891b05a78e85aa1a4f128dcab5cf221746 (diff) | |
| parent | ccd70d9c1689990e5aef2de383199bbc7cf60d13 (diff) | |
| download | ffmpeg-fab8a89abeae6bab5d2556d0116ca270ff6da5ed.tar.gz | |
Merge commit 'ccd70d9c1689990e5aef2de383199bbc7cf60d13'
* commit 'ccd70d9c1689990e5aef2de383199bbc7cf60d13':
vf_yadif: factorize initializing the filtering callbacks
Conflicts:
libavfilter/vf_yadif.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ffv1dec.c')
0 files changed, 0 insertions, 0 deletions