Merge commit '381dc1a5ec0925b281c573457c413ae643567086'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Oct 2012 12:45:44 +0000 (13:45 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Oct 2012 12:52:03 +0000 (13:52 +0100)
commitcd37963684d8ee9819af15ccebe09d84839101dd
tree33c99132f79f095301b4e453c40f0b77005f5b1d
parent60e957476e338a200501e0bdad40b7bf0076b268
parent381dc1a5ec0925b281c573457c413ae643567086
Merge commit '381dc1a5ec0925b281c573457c413ae643567086'

* commit '381dc1a5ec0925b281c573457c413ae643567086':
  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: Michael Niedermayer <michaelni@gmx.at>
cmdutils.c
doc/nut.texi
ffmpeg.c
libavcodec/aacenc.c
libavformat/nut.c
libavformat/nut.h
libavformat/nutdec.c
libavformat/nutenc.c
libavformat/rtsp.c
tests/fate/ac3.mak
tests/fate/acodec.mak