* commit '446e37dc97e533e37f6aa0a11355124207e3a7f7': vf_fieldorder: remove superfluous get_video_buffer Conflicts: libavfilter/vf_fieldorder.c See: 9b35bee696 Merged-by: Michael Niedermayer <michaelni@gmx.at>
9b35bee696