Commit b84cd22a authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '446e37dc'

* commit '446e37dc':
  vf_fieldorder: remove superfluous get_video_buffer

Conflicts:
	libavfilter/vf_fieldorder.c

See: 9b35bee6Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 85cabf1c 446e37dc
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment