* commit 'c692957c':
  lavu: remove disabled avoptions cruft
  lavu: remove disabled FF_API_GET_BITS_PER_SAMPLE_FMT cruft

Conflicts:
	libavutil/opt.c
	libavutil/opt.h
	libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '468ea9d5':
  Revert "avutil: make some tables visible again"
  Revert "avutil: Add a copy of ff_sqrt_tab back into avutil to restore ABI compatibility"

Conflicts:
	libavcodec/sqrt_tab.c
	libavutil/libavutil.v
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'add3a690':
  lavu: bump major to 52

Conflicts:
	libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '2b8dd371':
  lavu: postpone recent deprecations until the next major bump
  APIchanges: update lavr bump date
  avconv: only apply presets when we have an encoder.
  atrac3: replace a calculation with FFALIGN()
  atrac3: remove unused ATRAC3Context field, sample_rate
  atrac3: use sizeof(variable) instead of sizeof(type)
  atrac3: simplify MDCT window calculation

Conflicts:
	doc/APIchanges
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '5d1007f7':
  atrac3: initialize static tables in AVCodec.init_static_data()
  atrac3: separate window initialization from IMDCT initialization
  atrac3: move the 'frame_factor' field from ATRAC3Context to where it is used
  atrac3: remove unused ATRAC3Context field, bit_rate

Conflicts:
	libavcodec/atrac3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a2664c91':
  atrac3: move the 'samples_per_frame' field from ATRAC3Context to where it is used
  atrac3: remove unused ATRAC3Context field, samples_per_channel
  atrac3: use AVCodecContext.block_align instead of keeping a private copy
  atrac3: move the 'delay' field from ATRAC3Context to where it is used
  atrac3: move the 'version' field from ATRAC3Context to where it is used
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '5ac673b5':
  atrac3: use AVCodecContext.channels instead of keeping a private copy
  atrac3: simplify some loop indexing
  atrac3: cosmetics: pretty-printing and renaming
  pcm: define AVCodec instances only for enabled codecs
  libxvid: remove useless doxy comments.
  lavc: remove stats_out from the options table.

Conflicts:
	libavcodec/atrac3.c
	libavcodec/pcm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

This reverts commit def8c946.

After the major bump this is no longer necessary.

In addition to the recent tables mess, the AVOption defaults behavior
changed, so an old lavc used with a new lavu will get completely messed
up defaults.

This reverts commit d15c21e5.

After the major bump this is no longer necessary.

Fixes a crash when using a preset with stream copy.

CC: libav-stable@libav.org

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

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

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

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

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

Fixes CID703778, CID703777
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes CID703776, CID703775
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This should avoid some nasty ':' escaping.

The select filter requires some conversion to rgb24 for the scene
detection.

FATE_SAMPLES_FFPROBE is a different list than FATE_FFPROBE, the same way
FATE_SAMPLES_FFMPEG is a different list than FATE_FFMPEG; these
FATE_SAMPLES_<tool> lists are in the FATE_EXTERN list, which is only
used when SAMPLES is set.

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

This is needed for setting both contexts -err_detect at once.
Reviewed-by: Clément Bœsch <ubitux@gmail.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Some file has ID3 chunk placed after SSND.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

This way they are available to all applications and not just ffmpeg
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This allocates 4 bytes less than the previous code if avctx->block_align is
a multiple of 4, but the extra 4 bytes is not really needed.