Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 14 Oct 2012 13:11:34 +0000 (15:11 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 14 Oct 2012 13:11:34 +0000 (15:11 +0200)
commitd6f6a7557c8d25bb9943b4d3390550a9cffb918b
treed3f96d36dc86276ae0018c4294d416c972f3ea28
parentde3b1116dab12843b833e828bb219fb5673b0092
parent7638f0b2fef0481e55985ab8530e8ad9c16f113a
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avutil: Do not make ff_ symbols globally visible.
  avutil: Rename ff_set_systematic_pal2() ---> avpriv_set_systematic_pal2()
  build: tms470: work around glibc math.h problems
  configure: improve tms470 compiler usage with glibc

Conflicts:
libavcodec/bmpenc.c
libavcodec/rawdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure
libavcodec/bmpenc.c
libavcodec/pcxenc.c
libavcodec/rawdec.c
libavcodec/utils.c
libavfilter/vf_scale.c
libavutil/imgutils.c
libavutil/imgutils.h