1. 04 Apr, 2014 5 commits
    • James Darnley's avatar
      log: allow color highlighting in Cygwin's mintty · 16509d3a
      James Darnley authored
      Configure will detect the availability of the Windows' console functions and set
      HAVE_SETCONSOLETEXTATTRIBUTE.  Meaning av_log will use those functions to
      control colours.  When ffmpeg is run in Cygwin's mintty terminal emulator it
      will not use colour highlighting in this case.
      
      Mintty responds to the usual escape code colours (it even supports 256 colours).
      Windows' cmd.exe does not.  Fortunately it seems that Cygwin's emulation layer
      now translates the basic 16 colours into Windows' Console command functions.
      
      That means that we can have av_log use the standard colour commands and let
      ffmpeg print colours in both mintty and cmd.
      Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      16509d3a
    • Michael Niedermayer's avatar
      Merge remote-tracking branch 'qatar/master' · 634636eb
      Michael Niedermayer authored
      * qatar/master: (31 commits)
        riff: Add an additional AAC TwoCC
        riff: support 0xa100 TwoCC for G723_1
        riff: add 0x594a TwoCC for Xan DPCM
        riff: add 0x64 to g726
        riff: add G723_1 wav tag
        riff: map 0x0038 to amrnb
        riff: Support FLIC FourCC
        riff: add escape130 FourCC
        riff: support 'aas4' FourCC
        riff: add "YUV8" FourCC
        riff: Add "S263" FourCC
        riff: Support XMPG as mpeg1
        riff: support BW10 as mpeg1
        riff: Add SLDV FourCC for dvvideo
        riff: Support NTSC forward dvcpro videos
        riff: add dvis/pdvc FourCCs
        riff: add "GXVE" FourCC for WMV2
        riff: add PLV1 fourcc to mpeg4
        riff: Support decoding ASP variant from QNAP Systems
        riff: add "SM4V" FourCC
        ...
      
      Conflicts:
      	libavformat/riff.c
      
      See: various commits, all the merged changes where in ffmpeg already
      Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      634636eb
    • Michael Niedermayer's avatar
      Merge commit '121b5b7e' · 1946ad4d
      Michael Niedermayer authored
      * commit '121b5b7e':
        isom: add some BOXX tags
        isom: add 'flic' tag
        isom: add 'm1v ' tag
      
      Conflicts:
      	libavformat/isom.c
      
      See: ca8623e1
      See: 8a3f9764
      See: fca62f05Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      1946ad4d
    • Michael Niedermayer's avatar
      Merge commit 'ad8f736b' · 069e462b
      Michael Niedermayer authored
      * commit 'ad8f736b':
        mxf: Remove typo
      
      also See: [FFmpeg-devel] [PATCH 3/3] lavf/mxfdec: delete trailing semi-colon
      Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      069e462b
    • Michael Niedermayer's avatar
      Merge commit '9464b69d' · a692ff93
      Michael Niedermayer authored
      * commit '9464b69d':
        log: Unbreak windows support
      
      Conflicts:
      	libavutil/log.c
      
      No change as we didnt use print_256color() in our implementation
      Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      a692ff93
  2. 03 Apr, 2014 35 commits