Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 10 Mar 2012 00:12:08 +0000 (01:12 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 10 Mar 2012 00:12:08 +0000 (01:12 +0100)
commit8e31dbc1dcb56d40bcc1dd45840aaef0d37bae51
tree08342b8eede67521c32c139ebb4d9ddd04e871fa
parent1af9fdc3baa47596757da7c401d58710cef45c75
parentffae713a5b3a0d20ff958d8bd58a052b495c38fd
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Fix a bunch of common typos.
  build: Skip compiling xvmc.h under the correct condition.
  configure: darwin: Change dylib install names to include major version.
  mpegts: Always honor a registration descriptor if present and there is no other codec information.
  aacdec: Fix SCE parity check.
  aacdec: Fix out of array writes (stack).
  rtsp: Only set the ttl parameter if the server actually gave a value
  udp: Set ttl for read-write streams, too, not only for write-only ones
  udp: Only bind to the multicast address if in read-only mode
  udp: Clarify the comment about binding the multicast address
  udp: Reorder comments

Conflicts:
libavcodec/aacdec.c
tools/patcheck

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure
libavcodec/Makefile
libavcodec/aacdec.c
libavcodec/pgssubdec.c
libavcodec/vorbisenc.c
libavformat/mpegts.c
libavformat/r3d.c
libavformat/rtsp.c
libavformat/udp.c
tools/lavfi-showfiltfmts.c
tools/patcheck