• Michael Niedermayer's avatar
    Merge commit '381dc1a5' · cd379636
    Michael Niedermayer authored
    * commit '381dc1a5':
      fate: ac3: Place E-AC-3 tests and AC-3 tests in different groups
      fate: Add shorthands for acodec PCM and ADPCM tests
      avconv: Drop unused function argument from do_video_stats()
      cmdutils: Conditionally compile libswscale-related bits
      aacenc: Drop some unused function arguments
      rtsp: Avoid a cast when calling strtol
      nut: support textual data
      nutenc: verbosely report unsupported negative pts
    
    Conflicts:
    	cmdutils.c
    	ffmpeg.c
    	libavformat/nut.c
    	libavformat/nutenc.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    cd379636
aacenc.c 27.9 KB