[FFmpeg-cvslog] Merge commit '9953ff3cd844eb5f6d8dfce98cad94b78a0fc7dc'

Michael Niedermayer git at videolan.org
Fri Oct 12 16:09:38 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Oct 12 15:52:55 2012 +0200| [a9bd51b1e647d7ec0b7661e19b87ade86098b38c] | committer: Michael Niedermayer

Merge commit '9953ff3cd844eb5f6d8dfce98cad94b78a0fc7dc'

* commit '9953ff3cd844eb5f6d8dfce98cad94b78a0fc7dc':
  mpegvideo: fix indentation
  sws: do not use av_pix_fmt_descriptors directly.

Conflicts:
	libavcodec/mpegvideo.c
	libswscale/swscale_internal.h
	libswscale/swscale_unscaled.c
	libswscale/utils.c

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

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





More information about the ffmpeg-cvslog mailing list