diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-09 02:54:34 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-09 02:54:40 +0100 |
commit | ea9399f8f7dc68f6a4d90f6fd32a2857b0c6d39a (patch) | |
tree | ad7e52afac7115eb0a103aed38bd9a1ebe91a2b5 /libavfilter/vf_field.c | |
parent | 9c99bc1f3fb974f07bc9b565dad00d0e162a09c1 (diff) | |
parent | 085ca7dcdbf9ab6c23e3a5397b1f6d4aa23f763d (diff) | |
download | ffmpeg-ea9399f8f7dc68f6a4d90f6fd32a2857b0c6d39a.tar.gz |
Merge remote-tracking branch 'cus/stable'
* cus/stable:
libzvbi-teletextdec: split dvb packet to slices
libzvbi-teletextdec: use av_dlog where possible
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_field.c')
0 files changed, 0 insertions, 0 deletions