1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
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 tools: K&R reformatting cosmetics 2012-01-25 15:31:11 +01:00
build_libstagefright Merge remote-tracking branch 'hexene/stagefright' 2012-01-10 20:59:44 +01:00
clean-diff
cws2fws.c tools: K&R reformatting cosmetics 2012-01-25 15:31:11 +01:00
enum_options.c
ffeval.c tools: add ffeval tool 2012-01-17 12:10:07 +01:00
graph2dot.c Merge remote-tracking branch 'qatar/master' 2012-01-26 02:23:56 +01:00
ismindex.c ismindex: Fix build on mingw 2012-01-26 22:25:29 +01:00
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 Merge remote-tracking branch 'qatar/master' 2012-01-26 02:23:56 +01:00
probetest.c Merge remote-tracking branch 'qatar/master' 2012-01-26 02:23:56 +01:00
qt-faststart.c Merge remote-tracking branch 'qatar/master' 2012-01-26 02:23:56 +01:00
trasher.c Merge remote-tracking branch 'qatar/master' 2012-01-26 02:23:56 +01:00
unwrap-diff