Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 26 Mar 2012 18:34:29 +0000 (20:34 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 26 Mar 2012 18:52:52 +0000 (20:52 +0200)
commit7e496e154583b5fe11ccf04b833c418b22f05ca4
tree51ff1dc2484ab90ede1d715d30e935ce22b1af7d
parent60497cb984221268ef95d2b63476f4f3379fb7e2
parent72ccfb3cb7a85d35cfe2c99ab53e981974e599cd
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: ppc: drop stray leftover backslash
  build: Only clean the architecture subdirectory we build for.
  build: drop some unnecessary dependencies from the H.264 parser
  build: prettyprinting cosmetics
  libavutil: Remove pointless rational test program.
  libavutil: Remove broken and pointless lzo test program.
  lavf doxy: expand AVStream.codec doxy.
  lavf doxy: improve AVStream.time_base doxy.
  lavf doxy: add some basic documentation about reading from the demuxer.
  lavf doxy: document passing options to demuxers.
  lavf doxy: clarify that an AVPacket contains encoded data.
  mpegtsenc: allow user triggered PES packet flushing
  APIchanges: mark the place where 0.7 was cut.
  APIchanges: mark the place where 0.8 was cut.
  APIchanges: fill in missing dates and hashes.
  smacker: convert palette and header reading to bytestream2.
  alac: convert extradata reading to bytestream2.

Conflicts:
doc/APIchanges
libavcodec/smacker.c
libavcodec/x86/Makefile
libavfilter/Makefile
libavutil/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
14 files changed:
Makefile
configure
doc/APIchanges
libavcodec/Makefile
libavcodec/alac.c
libavcodec/smacker.c
libavcodec/x86/Makefile
libavfilter/Makefile
libavformat/Makefile
libavformat/avformat.h
libavformat/mpegtsenc.c
libavutil/Makefile
library.mak
libswscale/Makefile