Merge commit 'f7518f1a0e0a1788c303de3c6198da07e575710c'

* commit 'f7518f1a0e0a1788c303de3c6198da07e575710c':
  codec_desc: update dvaudio tag

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

Merge commit '6d7b22fb8f247a51e668c83b2f2460a9b3e948a8'

* commit '6d7b22fb8f247a51e668c83b2f2460a9b3e948a8':
  isom: fix C99-style declaration

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

Merge commit '1481d24c3a0abf81e1d7a514547bd5305232be30'

* commit '1481d24c3a0abf81e1d7a514547bd5305232be30':
  RGBA64 pixel formats

Conflicts:
doc/APIchanges
libavutil/pixdesc.c
libavutil/pixfmt.h
libavutil/version.h
libswscale/utils.c

See: 9569a3c9f41387a8c7d1ce97d8693520477a66c3
See: 92afb431621c79155fcb7171d26f137eb1bee028, as well as others
Note: the enum values added in libav are incompatible/different to what ffmpeg used since 3 years
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'd24e9a99a40166bf881ccd2e3ae5688af4726658'

* commit 'd24e9a99a40166bf881ccd2e3ae5688af4726658':
  h264 does not depend on mpegvideo any more

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

avcodec/vdpau: update ff_vdpau_h264_set_reference_frames() to H264Picture

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

Merge commit '7245a0ae872d4f65396a37d13f5d1d2c2efe11c2'

* commit '7245a0ae872d4f65396a37d13f5d1d2c2efe11c2':
  mpegvideo: remove h264-only fields

Conflicts:
libavcodec/mpegvideo.h

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

Merge commit 'be039278b5ebd8075d90a3508db2aed5adf59e02'

* commit 'be039278b5ebd8075d90a3508db2aed5adf59e02':
  mpegvideo: move ff_draw_horiz_band() to mpegutils.c

Conflicts:
libavcodec/Makefile

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

avcodec/dxva2: fix pointers after H264Picture

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

avcodec/vdpau: fix ff_vdpau_get_surface_id() argument after H264Picture

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

avcodec/vaapi: fix pointer types after H264Picture changes

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

Merge commit 'e0c16e4e3259cf50b5bac4c23bb6e517f397c74b'

* commit 'e0c16e4e3259cf50b5bac4c23bb6e517f397c74b':
  mpegvideo: move mpegvideo formats-related defines to mpegutils.h

Conflicts:
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
libavcodec/h264_mvpred.h
libavcodec/svq1enc.c

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

Merge commit '136034d86b5cb1819a2c3e6ecdfeb05dcba7140d'

* commit '136034d86b5cb1819a2c3e6ecdfeb05dcba7140d':
  h264: Remove MotionEstContext and move the relevant fields to H264Context

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

Merge commit 'e3c2d0f3d41f79f7be7ba944aaca2e287c7d5c7c'

* commit 'e3c2d0f3d41f79f7be7ba944aaca2e287c7d5c7c':
  h264: Replace mpegvideo-specific MAX_THREADS by private define

Conflicts:
libavcodec/h264.h

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

Merge commit '5d1c2e53ab3ce27b48c138d22bb01ff8e8304f27'

* commit '5d1c2e53ab3ce27b48c138d22bb01ff8e8304f27':
  h264: Replace mpegvideo-specific MAX_PICTURE_COUNT by private define

Conflicts:
libavcodec/h264.c
libavcodec/h264_ps.c

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

avcodec/h264: h264_set_erpic() clear destination

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

Merge commit '9b749c8274f6b6f35dde2cf29b99fa4f719abf87'

* commit '9b749c8274f6b6f35dde2cf29b99fa4f719abf87':
  h264: move relevant fields from Picture to H264Picture

Conflicts:
libavcodec/h264.c

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

avcodec/error_resilience: fix the case when MVs are not available

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

avcodec/mpegvideo: ff_mpeg_set_erpic() clear destination

Fixes crash

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

Merge commit 'd66e305bd1b4f3e91ae4e7e549148509d0811672'

* commit 'd66e305bd1b4f3e91ae4e7e549148509d0811672':
  er: move relevant fields from Picture to ERPicture

Conflicts:
libavcodec/error_resilience.c
libavcodec/h264.c

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

Merge commit '1c79b1625d4d257bfd01eccb84cc0ab355fb9a9e'

* commit '1c79b1625d4d257bfd01eccb84cc0ab355fb9a9e':
  h264: directly use frames in ff_h264_draw_horiz_band()

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

Merge commit '75af13a'

* commit '75af13a':
  mpegvideo: directly use frames in ff_draw_horiz_band()

Conflicts:
libavcodec/mpegvideo.c

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

avcodec/x86/idct_sse2_xvid: move offsets out of MANGLE()

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

avcodec/h264: be more tolerant on what pixel format changes trigger reinits

Fixes Ticket3260

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

Add missing external declarations.

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

Fixed 64bit conformance with mvzbl.

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

swscale/x86/swscale: remove unused constants

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

codec_desc: update dvaudio tag

isom: fix C99-style declaration

RGBA64 pixel formats

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

h264 does not depend on mpegvideo any more

mpegvideo: remove h264-only fields

mpegvideo: move ff_draw_horiz_band() to mpegutils.c

Drop the mpegvideo dependency for svq3 in configure.

mpegvideo: move mpegvideo formats-related defines to mpegutils.h

h264: Remove MotionEstContext and move the relevant fields to H264Context

Unused buffers scratchpad and temp have been dropped too.

h264: Replace mpegvideo-specific MAX_THREADS by private define

h264: Replace mpegvideo-specific MAX_PICTURE_COUNT by private define

h264: move relevant fields from Picture to H264Picture

er: move relevant fields from Picture to ERPicture

This is done to disentangle ER from mpegvideo. In order to use a
classic Picture, callers can use ff_mpeg_set_erpic() or use a custom function
to set the fields. Please note that buffers need to be allocated before
calling ff_er_frame_end().

h264: directly use frames in ff_h264_draw_horiz_band()

mpegvideo: directly use frames in ff_draw_horiz_band()

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  aacdec: Lower the number of frames required to detect ADTS

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

Merge commit '0412cb67cda05b08dfca6bfc4ff664ea917fa932'

* commit '0412cb67cda05b08dfca6bfc4ff664ea917fa932':
  aacdec: Don't count probed ADTS frames if there are false positives

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

aacdec: Lower the number of frames required to detect ADTS

For live audio streams, requiring 500 frames for a stream to
be detected is a bit overkill.

This allows live ADTS streams that don't start nicely at
a frame boundary to start up more quickly, e.g.
http://mp3.streampower.be/radio1.aac.

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

aacdec: Don't count probed ADTS frames if there are false positives

If a portion of the probe buffer seem to resemble ADTS frames,
but some data at the end is a mismatch, disregard the whole
probing attempt. If it actually is ADTS data, there shouldn't be
any mismatches within the sequential frame data.

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

Changelog: move post 2.2 branching entries out of the 2.2 changelog

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

Phantom Cine demuxer (iteration 2014.3)

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

avcodec/rawdec: decode 16-bit aligned and packed 'raw' pixel formats where bits_per_coded_sample < 16

The bit packing method is communicted via codec_tag:
    BIT[0]  big-endian packing
    BIT[16] 16-bit little endian packing
    BIT[32] 32-bit little-endian packing

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

avfilter/vf_tinterlace: Fix vf_tinterlace mode 6 (interlacex2)

The purpose of this filter mode is to allow interlaced content to
display properly in interlaced video modes, as described in
http://forum.xbmc.org/showthread.php?tid=81834 and
https://github.com/mpv-player/mpv/issues/624#issuecomment-37685195 . The
filter doubles the video frame rate, but does not work properly because:
(1) it does not set the properties of the output stream to indicate the
doubled frame rate, and
(2) it does not set an appropriate PTS on the extra frames.
The attached patch fixes these problems by settling these values the
same way they are set in vf_yadif mode 1 (field) which also doubles the
frame rate.

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

avformat/movenc: omit avformat ident from isml_manifest for bitexact mode

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

avformat/movenc: omit LIBAVCODEC_IDENT for bitexact mode from uuidusmt_tag

This code is apparently not tested by fate

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

avformat/movenc: only ommit encoder tag of the metadata for bitexact mode

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

ffmpeg_opt: check that a subtitle encoder is available before auto mapping streams

Fixes Ticket3470

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  FATE: add a test for the ONE_STR mapping mode of the channelmap filter

Conflicts:
tests/fate/filter-audio.mak

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

Merge commit 'e843612695007cc623813073754c651ab43021f7'

* commit 'e843612695007cc623813073754c651ab43021f7':
  af_channelmap: fix ONE_STR mapping mode

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

avformat/isom: fix mix of declaration and statement

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

Merge commit '8f629a986c46f227abda1811a6ad1f449871ca35'

* commit '8f629a986c46f227abda1811a6ad1f449871ca35':
  isom: convert mp4 dvdsub extradata to vobsub format

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

FATE: add a test for the ONE_STR mapping mode of the channelmap filter

af_channelmap: fix ONE_STR mapping mode

get_channel() returns 0 on success

CC:libav-stable@libav.org

ffmpeg: fix printing INT64_MIN pts at the end

Fixes Ticket3427

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

swscale/x86/swscale: fix missing xmm clobbers in yuv2yuvX_sse3()

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

ffmpeg_opt: Check ist is valid before using it in audio_channels_map init

Fixes segfault and instead provides an error message
Fixes Ticket3465

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

avcodec/mpegvideo_enc: dont use direct mode for unaligned input

Fixes Ticket3456

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

avcodec: Move STRIDE_ALIGN to internal.h

The next commit/bugfix will need it

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

isom: convert mp4 dvdsub extradata to vobsub format

mp4 files embedding DVD subtitles do not use the same extradata format
as the rest of Libav expects. The subtitle decoder in libavcodec in
particular does not understand this format.

Convert the extradata to the vobsub .idx format. mp4 stores the palette
as binary 32 bit ints in YUV. The subtitle resolution is stored
separately in the track header, which we access through AVStream.

Signed-off-by: Anton Khirnov <anton@khirnov.net>

avformat/id3v2: decode compilation metadata

Described http://id3.org/iTunes%20Compilation%20Flag

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/movenc: encode compilation metadata

Fixes ticket #2960.

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/mov: decode compilation metadata

This flag is known as 'Part of a compilation' in Apple iTunes.

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/adpcm: ADPCM_IMA_DK3 packets are padded to 16-bit packet boundary

Fixes ticket #3461.

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/arm/cabac: fix inline cabac reader with the UNCHECKED bitstream reader

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

avcodec/h264_cabac: move the arm unchecked_bitstream reader special case closer to where the issue is

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

avcodec/h264_cabac: disable the unchecked bitstream reader for arm & aarch64

The newly added optimizations do not work with the unchecked reader

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

avfilter: make avfilter_graph_get_filter use const string name

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

configure: factorize mips arch extensions out

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

configure: remove unused identifer that was added by cleanups

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  codec_desc: group image codecs together

Conflicts:
libavcodec/codec_desc.c

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

Merge commit 'd42ea06798b83d87397449ec6aad40cb5ea46e43'

* commit 'd42ea06798b83d87397449ec6aad40cb5ea46e43':
  codec_desc: add missing .long_name

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

Merge commit '999d31d354f1f0616a09691913659ac0abdcc899'

* commit '999d31d354f1f0616a09691913659ac0abdcc899':
  codec_desc: K&R formatting cosmetics

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

Merge commit '7a650caf6436ddfe417bdcb5ce520c96c779af7b'

* commit '7a650caf6436ddfe417bdcb5ce520c96c779af7b':
  configure: Split some logical blocks off from HAVE_LIST

Conflicts:
configure

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

Merge commit 'd0adf55c05beaf80420747dded2d1884bff377ec'

* commit 'd0adf55c05beaf80420747dded2d1884bff377ec':
  configure: Split some logical blocks off from CONFIG_LIST

Conflicts:
configure

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

Merge commit '07ea8a7e943ea6a7bdcd736e2fc3ed357dc15c57'

* commit '07ea8a7e943ea6a7bdcd736e2fc3ed357dc15c57':
  configure: Group and sort function/struct/type checks

Conflicts:
configure

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

Merge commit '36b822b8be7f9ecd6f9d87acaa786b128a873cd9'

* commit '36b822b8be7f9ecd6f9d87acaa786b128a873cd9':
  arm: dsputil: Drop restrict keyword from add_pixels_clamped_armv6 prototype

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

codec_desc: group image codecs together

codec_desc: add missing .long_name

codec_desc: K&R formatting cosmetics

configure: add missing avx2 support check

AVX2 support was introduced in Yasm 1.2.0, and some distros
like Debian still feature version 1.1.0

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/adpcm: squelch 'mismatch in coded sample count' warning for AV_CODEC_ID_ADPCM_EA_R2/3

These ADPCM codecs include a per-frame flag that enables a raw 16-bit mode. Therefore
the the number of samples returned by get_nb_samples() is only ever approximate.

Fixes ticket #3460.

Signed-off-by: Peter Ross <pross@xvid.org>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/arm/fft_fixed_neon: reduce diff by 2 spaces to libav

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

configure: Split some logical blocks off from HAVE_LIST

configure: Split some logical blocks off from CONFIG_LIST

configure: Group and sort function/struct/type checks

Group checks into logical groups and sort alphabetically within those groups
unless checks have close coupling. Keep closely coupled checks together.

arm: dsputil: Drop restrict keyword from add_pixels_clamped_armv6 prototype

The function is assigned to a function pointer that does not have the
restrict keyword for that parameter.

This fixes compilation for MSVC builds that don't recognize "restrict",
broken since ed9625eb62.

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  aac: K&R formatting cosmetics

Conflicts:
libavformat/aacdec.c

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

Merge commit '2e708f17083fc41f10161f2406d57ec154c75468'

* commit '2e708f17083fc41f10161f2406d57ec154c75468':
  ljpeg: fix duplicated pixel format entry

Conflicts:
libavcodec/ljpegenc.c

No change as there was no duplicate entry in ffmpeg

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

avcodec/libx265: fill headers in extradata

Fixes Ticket3457

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

Merge commit 'eb2b8bce39c93d16a02656238248c6cf697f447f'

* commit 'eb2b8bce39c93d16a02656238248c6cf697f447f':
  bfin: Use more sensible file names

Conflicts:
libavcodec/bfin/pixels.h

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

Merge commit '929ec39ec4497827f7530f2aaa31646ef35462ee'

* commit '929ec39ec4497827f7530f2aaa31646ef35462ee':
  bfin: hpeldsp: Split no_rnd pixel operations off into a separate file

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

Merge commit 'a7cc4ac9d99bd586c8939f4312f8c9e56d5f5730'

* commit 'a7cc4ac9d99bd586c8939f4312f8c9e56d5f5730':
  bfin: dsputil: Unconditionally compile hpel pixels code

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

Merge commit '13ae97b210f35d77290f4edb0d6846269271729a'

* commit '13ae97b210f35d77290f4edb0d6846269271729a':
  bfin: hpeldsp: "nornd" ---> "no_rnd" function name suffix for consistency

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

Merge commit 'bbf0ef57e9d2d7bb2995f664dd74c8229bca25f5'

* commit 'bbf0ef57e9d2d7bb2995f664dd74c8229bca25f5':
  bfin: Move all assembly declarations only used within one .c file there

Conflicts:
libavcodec/bfin/dsputil_bfin.h
libavcodec/bfin/vp3_bfin.h

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

Merge commit '80173c71bab3b8817c148837bdc920557018f428'

* commit '80173c71bab3b8817c148837bdc920557018f428':
  bfin: hpeldsp: K&R formatting cosmetics

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