diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-24 14:38:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-24 15:24:22 +0200 |
| commit | 558ce3e5b74c37546c66a26e4e03733d4f09ed76 (patch) | |
| tree | d1d50c8ceb7a34309a7dc01bca27bfc93cc00879 /libavformat/rtp.h | |
| parent | 2516b393d4dda849851cc44ccb610bd87cec1798 (diff) | |
| parent | 8a994b7406b3ab24a6444037da9d1659f3125a01 (diff) | |
| download | ffmpeg-558ce3e5b74c37546c66a26e4e03733d4f09ed76.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vf_fade: support slice threading
vf_yadif: support slice threading
Conflicts:
libavfilter/vf_fade.c
libavfilter/vf_yadif.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtp.h')
0 files changed, 0 insertions, 0 deletions