Skip to content
  • Michael Niedermayer's avatar
    Merge remote-tracking branch 'newdev/master' · 4fa0e247
    Michael Niedermayer authored
    
    
    * newdev/master: (33 commits)
      Fix an infinite loop when RoQ encoded generated a frame with a size greater than the maximum valid size.
      Add kbdwin.o to AC3 decoder
      Detect byte-swapped AC-3 and support decoding it directly.
      cosmetics: indentation
      Always copy input data for AC3 decoder.
      ac3enc: make sym_quant() branch-free
      cosmetics: indentation
      Add a CPU flag for the Atom processor.
      id3v2: skip broken tags with invalid size
      id3v2: don't explicitly skip padding
      Make sure kbhit() is in conio.h
      fate: update wmv8-drm reference
      vc1: make P-frame deblock filter bit-exact.
      configure: Add the -D parameter to the dlltool command
      amr: Set the AVFMT_GENERIC_INDEX flag
      amr: Set the pkt->pos field properly to the start of the packet
      amr: Set the codec->bit_rate field based on the last packet
      rtsp: Specify unicast for TCP interleaved streams, too
      Set the correct target for mingw64 dlltool
      applehttp: Change the variable for stream position in seconds into int64_t
      ...
    
    Conflicts:
    	ffmpeg.c
    	ffplay.c
    	libavcodec/ac3dec.c
    	libavformat/avio.h
    	libavformat/id3v2.c
    
    Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
    4fa0e247