[FFmpeg-cvslog] Merge commit '446e37dc97e533e37f6aa0a11355124207e3a7f7'

Michael Niedermayer git at videolan.org
Mon Nov 4 21:20:14 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Nov  4 21:01:58 2013 +0100| [b84cd22a6661d5d1b5fc3660d5ade528b4813aea] | committer: Michael Niedermayer

Merge commit '446e37dc97e533e37f6aa0a11355124207e3a7f7'

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

Conflicts:
	libavfilter/vf_fieldorder.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b84cd22a6661d5d1b5fc3660d5ade528b4813aea
---





More information about the ffmpeg-cvslog mailing list