Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Paul B Mahol <onemda@gmail.com>

This is a temporary workaround for amerge,
until format renegociation is implemented.

Should fix trac ticket #1400.

These utilities are meant to be defined in avfilter.c, since they are
generic and thus contain both audio and video code.

Found, analysed and tested by trac user Jamal.

Fixes ticket #1411

This is the deprecated version of the function but it is exported, so it
should fix the shared FATE box.

register starvation caused gcc4.2 to fail building 32 bit shared libs
on 64 bit OS X
Signed-off-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

The filtering_audio.c example needs to be updated for the new
"abuffer" filter args.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* cus/stable:
  ffplay: calculate audio diff threshold based on the actual settings
  ffplay: try more channel count combinations for SDL_OpenAudio
  ffplay: simplify audio_open, rename parameters to more explanatory names
  ffplay: remove VideoState from audio_open
  ffplay: put audio parameters to their own struct
  ffplay: put audio_open into a seperate function
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  movenc: Write chan atom for all audio tracks in mov mode movies.
  mpegtsenc: use avio_open_dyn_buf(), zero pointers after freeing
  doc/avconv: add some details about the transcoding process.
  avidec: make scale and rate unsigned.
  avconv: check output stream recording time before each frame returned from filters
  avconv: split selecting input file out of transcode().
  avconv: split checking for active outputs out of transcode().
  avfiltergraph: make some functions static.

Conflicts:
	ffmpeg.c
	libavfilter/avfiltergraph.c
	libavfilter/internal.h
	libavformat/mpegtsenc.c
	tests/ref/fate/acodec-alac
	tests/ref/fate/acodec-pcm-s16be
	tests/ref/fate/acodec-pcm-s24be
	tests/ref/fate/acodec-pcm-s32be
	tests/ref/fate/acodec-pcm-s8
	tests/ref/lavf/mov
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Based on the shotdetect algorithm (http://shotdetect.nonutc.fr/ by Johan
MATHE johan.mathe tremplin-utc.net).

This works as expected if the input stream is not yuv4xxp.

Reviewed-by: Paul B Mahol

This fixes -vol leading to 2 inserted volume filters
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Per suggestion by Michael Niedermayer.
Signed-off-by: Jindřich Makovička <makovick@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>

The specs say they are unsigned 32bit integers.

There may be multiple frames returned, so with just one check we can
write more than requested to the output.

They are not used outside of avfiltergraph.c

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Found, analysed and tested by trac user Jamal.

Fixes part of Ticket #1404.

Found, analysed and tested by trac user Jamal.

Fixes part of Ticket #1404.

Found, analysed and tested by trac user Jamal.

Fixes part of Ticket #1404.