FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00

History

Michael Niedermayer cd37963684 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>

2012-10-30 13:52:03 +01:00

fate

Merge commit '381dc1a5ec0925b281c573457c413ae643567086'

2012-10-30 13:52:03 +01:00

ref

fate: make sure the global sws flags are set to be bitexact for scalenorm

2012-10-28 13:05:35 +01:00

asynth1.sw

…

audiogen.c

Merge remote-tracking branch 'qatar/master'

2012-07-29 02:16:26 +02:00