[FFmpeg-cvslog] Merge commit '1c5805521c3e406886341d752ebf38f8d41e1d13'

Michael Niedermayer git at videolan.org
Mon Nov 19 14:21:09 CET 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Nov 19 14:05:41 2012 +0100| [4116151a4bf35cffd2b55b028e714bb2c383c86f] | committer: Michael Niedermayer

Merge commit '1c5805521c3e406886341d752ebf38f8d41e1d13'

* commit '1c5805521c3e406886341d752ebf38f8d41e1d13':
  PGS subtitles: Set AVSubtitle pts value
  configure: Refactor CPPFLAGS settings for glibc/uclibc
  configure: add basic support for ARM AArch64
  build: set -U__STRICT_ANSI__ for newlib

Conflicts:
	configure
	libavcodec/pgssubdec.c

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

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





More information about the ffmpeg-cvslog mailing list