OSDN Git Service

Merge commit '446e37dc97e533e37f6aa0a11355124207e3a7f7'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Nov 2013 20:01:58 +0000 (21:01 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Nov 2013 20:19:25 +0000 (21:19 +0100)
commitb84cd22a6661d5d1b5fc3660d5ade528b4813aea
tree5cac6c8fcca90badb397dd816513491eebf5929c
parent85cabf1ca98fcc502fcf5b8d6bfb6d8061c2caef
parent446e37dc97e533e37f6aa0a11355124207e3a7f7
Merge commit '446e37dc97e533e37f6aa0a11355124207e3a7f7'

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

Conflicts:
libavfilter/vf_fieldorder.c

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