1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
FFmpeg/libavformat
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
..
2012-02-06 20:33:06 +01:00
2012-03-03 04:30:49 +01:00
2012-03-03 04:30:49 +01:00
2012-02-05 17:42:26 +01:00
2012-02-02 14:31:17 +01:00
2012-03-09 01:55:45 +01:00
2012-03-03 04:30:49 +01:00
2012-03-08 21:31:45 +01:00
2012-02-02 14:31:17 +01:00
2012-03-02 11:11:38 +01:00
2012-02-29 14:26:14 +01:00
2012-02-28 07:20:36 +01:00
2012-02-26 07:30:21 +01:00
2012-02-23 16:00:22 +01:00
2012-02-28 15:01:20 +01:00
2012-02-14 10:12:44 +01:00