Merge commit '446e37dc97e533e37f6aa0a11355124207e3a7f7'

Browse Source

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

Conflicts:
	libavfilter/vf_fieldorder.c

See: 9b35bee696739eb6774bdba30504c51132e2a934
Merged-by: Michael Niedermayer <michaelni@gmx.at>

...

This commit is contained in:

Michael Niedermayer 2013-11-04 21:01:58 +01:00

parent 85cabf1ca9 446e37dc97

commit b84cd22a66

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available