Skip to content
Snippets Groups Projects
Commit b84cd22a authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit '446e37dc' 


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

Conflicts:
	libavfilter/vf_fieldorder.c

See: 9b35bee6
Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 85cabf1c 446e37dc
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 deletions
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