* commit '930ffd46':
  aacsbr: change order of operation to prevent out of array read

Conflicts:
	libavcodec/aacsbr.c

See: c2340831Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '9f6f4074':
  aacsbr: treat 1-d arrays as such
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f52b8717':
  celp_filters: don't use filter lenght as loop bound

See: 3f010421Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c442190a':
  error_resilience: initialize prev_* variables

Note, these variables are not used without initialization prior
to the change
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '240b22af':
  motion_est: remove dead code
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '351d0f8b':
  get_bits: remove unused assignment

Conflicts:
	libavcodec/get_bits.h

See: ea6178ffMerged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes canvas size
Fixes Ticket4074
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes accessing uninitialized memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This avoids creating unwieldy large packets, which is allowed but
does not seem to be a good idea
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

CC: libav-stable@libav.org
Bug-Id: CID 732250

TDRL is what we used as a replacement of TYER, and, according to
http://id3.org/id3v2.4.0-changes :
    TYER - Year
        This frame is replaced by the TDRC frame, 'Recording time'
        [F:4.2.5].
So change TDRL usages to TDRC.

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

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

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

This way if we by chance run into a valid PMT we have a more complete
set of streams, also do not reset streams in case we run into a worse
PMT

Fixes Ticket4046

alternatively Ticket4046 could be closed as invalid or wontfix as it contains
some PMTs which lack the 2 subtitle streams
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Should make no difference but will be needed for subsequent commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

previously quality could only be set through qscale/global_quality but the scale
was inverted. Using a separate option avoids the confusion from qscale working
backward.
Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Reviewed-by: Clément Bœsch <u@pkh.me>
Reviewed-by: Nicolas George <george@nsup.org>
Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

CC: libav-stable@libav.org
Bug-Id: CID 1238802 / CID 1238793 / CID 1238785
        CID 1238808 / CID 1238809

CC: libav-stable@libav.org
Bug-Id: CID 717906 / CID 717907 / CID 717916 /
        CID 717917 / CID 717919 / CID 732259

CC: libav-stable@libav.org
Bug-Id: CID 732293 / CID 732294

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

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

fixes the remainder overflowing beyond .999
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This can be useful for videos in which the interlacing pattern changes.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

mb_type is initialized to 0 and never updated before the check.

Bug-Id: CID 1238782

Bug-Id: CID 1238816

Replace xcb_event by xcb, as the former is no more used and the latter
is needed on configurations where only xcb is available, and not
libxcb_shm and/or libxcb_xfixes.
Signed-off-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Found-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '2f221b6a':
  movenc: Define the flag bits using shifts instead of as decimal numbers
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Martin Storsjö <martin@martin.st>

Avoid the creation of files which cannot be successfully decoded by
ffmpeg, for example generated with:
ffmpeg -f lavfi -i sine -af "aselect='not(between(t,100,500))',aresample=min_comp=0.001:min_hard_comp=0.100000" -acodec pcm_s16le -t 1000 -y out_audio.flv

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

Fixes ticket #4072.

Fixes ticket #4069.