ffmpeg/tools
Michael Niedermayer 8e31dbc1dc 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>
2012-03-10 01:12:08 +01:00
..
aviocat.c
build_libstagefright
clean-diff
cws2fws.c
enum_options.c
ffeval.c
graph2dot.c
ismindex.c
lavfi-showfiltfmts.c Merge remote-tracking branch 'qatar/master' 2012-03-10 01:12:08 +01:00
patcheck Merge remote-tracking branch 'qatar/master' 2012-03-10 01:12:08 +01:00
pktdumper.c
probetest.c
qt-faststart.c
trasher.c
unwrap-diff