[FFmpeg-cvslog] Merge commit '80035db88c1f7cc23110c7472a2b13a4d2d8b73e'

Michael Niedermayer git at videolan.org
Wed Apr 2 02:53:06 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr  2 02:43:19 2014 +0200| [119cf2a44b124ac5ed749589a78233272f4101a1] | committer: Michael Niedermayer

Merge commit '80035db88c1f7cc23110c7472a2b13a4d2d8b73e'

* commit '80035db88c1f7cc23110c7472a2b13a4d2d8b73e':
  lavu: add missing formats to av_pix_fmt_swap_endianness

Conflicts:
	libavutil/pixdesc.c

No change as our av_pix_fmt_swap_endianness() does not need formats to be listed individually

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

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





More information about the ffmpeg-cvslog mailing list