Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 4 Dec 2012 13:23:22 +0000 (14:23 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 4 Dec 2012 13:23:22 +0000 (14:23 +0100)
commitdacd6202ec50d122fcb7e9e92cdd014444cd2a98
tree0c9ceb86ced0b85eb1b1eccfc7346060b69a2b37
parent765debf51f1aee58b6748e575082ecd30033b323
parent1944d532a8a1c4b12222f0acfeb1153630dbc996
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  ppc: always use pic for shared libraries
  build: cosmetics: Move CONFIG_RTPDEC entry to a more suitable place
  fate: ea, h264: prettyprinting and ordering cosmetics

Conflicts:
tests/fate/ea.mak
tests/fate/h264.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure
libavformat/Makefile
tests/fate/ea.mak
tests/fate/h264.mak