• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 8e31dbc1
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    8e31dbc1
r3d.c 11 KB