libavfilter/vf_scale.c · 67fad0d221458d43edb9037c30171d0adb1d609a · Samuel Mira / ffmpeg

11 years ago

Michael Niedermayer authored 11 years ago


* commit '5f87c277':
  vf_scale: add endianness conversion pixel format in query_formats

Conflicts:
	libavfilter/vf_scale.c

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

fe5b0895

History

Merge commit ''

Michael Niedermayer authored 11 years ago


* commit '5f87c277':
  vf_scale: add endianness conversion pixel format in query_formats

Conflicts:
	libavfilter/vf_scale.c

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