diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-04 13:20:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-04 13:20:50 +0200 |
| commit | 489d8a79a6498afa754ffb16af2658e8aa4446e3 (patch) | |
| tree | d774ba3ebddf721dfac6357d8d958ce757a63fa3 /libavcodec/thread.h | |
| parent | 0f1446a4d010a1210c8b13562e83c9b157553764 (diff) | |
| parent | 4673a5a761f329af0aa56fc84f34ed898188bfa2 (diff) | |
| download | ffmpeg-489d8a79a6498afa754ffb16af2658e8aa4446e3.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vf_overlay: properly sync inputs.
Conflicts:
libavfilter/vf_overlay.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/thread.h')
0 files changed, 0 insertions, 0 deletions