avformat/concatdec: fix "warning: explicitly assigning a variable of type int to itself"

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/adpcmenc: Use FF_ALLOC_ARRAY_OR_GOTO()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/ac3enc_template: Use FF_ALLOC_ARRAY_OR_GOTO()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/aacenc: Use FF_ALLOCZ_ARRAY_OR_GOTO()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
doc: Fix syntax and logical errors in avconv stream combination example

Bug-Id: 661
CC: libav-stable@libav.org
avcodec/twinvq: Use FF_ALLOC_ARRAY_OR_GOTO()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/mpegvideo: Use FF_ALLOCZ_ARRAY_OR_GOTO()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/dnxhdenc: Use FF_ALLOCZ_ARRAY_OR_GOTO()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/h264: Use FF_ALLOCZ_ARRAY_OR_GOTO()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '775a0b04f0cf8102fe322b2ee03fe1a0633dea04'

* commit '775a0b04f0cf8102fe322b2ee03fe1a0633dea04':
  doc: Fix syntax and logical errors in avconv stream combination example

Conflicts:
	doc/ffmpeg.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg: Do av_buffersink_set_frame_size() when reconfiguring the filtergraph not just when changing audio resample parameters

Fixes Ticket3562

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avformat/rmdec: very basic MLTI support

Fixes Ticket2152

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avformat/img2: Make AVOptions available to img* demuxers defined in other files

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avformat/img2_brender_pix: Add AVClass and image2 AVOptions

This fixes the default timebase and allows overriding the framerate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avformat/img2_alias & brender_pix: fix function names

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avformat/img2_alias_pix: Add AVClass and image2 AVOptions

This fixes the default timebase and allows overriding the framerate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/pngdec: print the actual number of bytes left in the error case

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/png_parser: Return the buffered data at the end

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avutil/ppc/float_dsp_altivec: ppc: Fix bug in ff_vector_fmul_add_altivec() affecting little endian environments on POWER8

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
configure: fix check_cmd in check_host_cpp

Use correct cpp and c flags variables for the host libc.

Signed-off-by: Jörg Krause <jkrause@posteo.de>
Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>