Merge commit '1c5805521c3e406886341d752ebf38f8d41e1d13'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 19 Nov 2012 13:05:41 +0000 (14:05 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 19 Nov 2012 13:05:41 +0000 (14:05 +0100)
commit4116151a4bf35cffd2b55b028e714bb2c383c86f
tree7c27376f37acef2ec4e908cd9275578e69e665ba
parentfdbb6164a208df6d2665453da6d18d2cda13189b
parent1c5805521c3e406886341d752ebf38f8d41e1d13
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@gmx.at>
configure
libavcodec/pgssubdec.c