* cus/stable:
  ffplay: silence buffer size must be a multiple of frame size
  ffplay: use swr_set_compensation for audio synchronization
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes ticket #707.

Reviewed-by: Peter Ross

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

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

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

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

* qatar/master:
  FATE: add tests for targa
  ARM: fix Thumb-mode simple_idct_arm
  ARM: 4-byte align start of all asm functions
  rgb2rgb: rgb12to15()
  swscale-test: fix stack overread.
  swscale: fix invalid conversions and memory problems.
  cabac: split cabac.h into declarations and function definitions
  cabac: Mark ff_h264_mps_state array as static, it is only used within cabac.c.
  cabac: Remove ff_h264_lps_state array.

Conflicts:
	libswscale/rgb2rgb.h
	libswscale/swscale_unscaled.c
	tests/fate/image.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Reviewed-by: Michael Bradshaw

Reviewed-by: Michael Bradshaw

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

Some of these encoders may produce invalid bitstreams, which should not
be done without the user knowing.
Some of these decoders may be unfinished and may contain security issues.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Reviewed-by: Jean First

Reviewed-by: Jean First

Fixes a part of ticket #503.

Reviewed-by: Paul B Mahol
Reviewed-by: Jean First

libavutil now supports 64bit RGB formats.

Reviewed-by: Paul B Mahol

Based on a patch by Oana Stratulat <oanaandreeastratulat@gmail.com>

The alignment directive must obviously precede the label.
This was never noticed in ARM mode since the location is
already aligned there.
Signed-off-by: Mans Rullgard <mans@mansr.com>

Due to apprent bugs in the GNU assembler and/or linker, relocations
can be incorrectly processed if the alignment of a Thumb instruction
is changed in the output file compared to the input object.

This fixes crashes in h264 decoding with Thumb enabled. No effect in
ARM mode since everything is 4-byte aligned there.
Signed-off-by: Mans Rullgard <mans@mansr.com>

Fixes valgrind fate with fate-suite/r3d/4MB-sample.r3d.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

Variable totalangles was created and assigned, but never used.
Signed-off-by: Ray Simard <rhs.ffmpeg@sylvan-glade.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

Initialize Transform structs t and orig to zero.
Signed-off-by: Ray Simard <rhs.ffmpeg@sylvan-glade.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

Fix libavfilter library version numbers generation, which was broken in
3167dc95.

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

This fixes a segmentation fault when doing a transcoding and a stream
copy of the same input stream at the same time, e.g.:

ffmpeg -i in.mkv -c:v mpeg2video transcode.m2v -c copy copy.ts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

With the added benefit that allowing -segment_list_size 0 makes it
possible to keep all segment entries in the list file.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This reverts commit 0fd88d39.

Theres no reason to drop support for this.

Give a more generic advice.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>