Merge commit '1ea9fa15c3f9074f6199f68bdd6258c5a2bb89e0'

* commit '1ea9fa15c3f9074f6199f68bdd6258c5a2bb89e0':
  libopenjpeg: K&R formatting cosmetics

Conflicts:
libavcodec/libopenjpegdec.c
libavcodec/libopenjpegenc.c

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

Automatically change MANGLE() into named inline asm operands when direct symbol reference in inline asm are not supported.

This is part of the patch-set for intel C inline asm on windows support

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

avcodec/x86/mlpdsp: Only use asm when non-local inline asm lables are supported

This is part of the patch-set for intel C inline asm on windows support

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

swscale/utils: Fix color range of gray16

Improves rgb -> gray16 conversion

Fixes Ticket3422

The pam and png output files look visually similar, in both cases the
dynamics increase to 0x0 -> 0xfffb.

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

libopenjpeg: K&R formatting cosmetics

avcodec/h264pred_template: fix declarations after statements

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

avcodec/h264: fix Lossless Decoding (Profile 244) for 8x8 Intra Prediction

This is limited to the case where x264_build = -1, to not break x264 decoding

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  float_dsp: add test program and use it as fate test

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

Merge commit 'd961a79eb07a8911540a0bd356d68ae0cf93c6a1'

* commit 'd961a79eb07a8911540a0bd356d68ae0cf93c6a1':
  sbrdsp: move #if to disable all educational code

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

Merge commit 'c829b35c08ad8e1df45cca1cd12f084cf1183d07'

* commit 'c829b35c08ad8e1df45cca1cd12f084cf1183d07':
  lavc: er: remove unused variable size

No change as the variable is used

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

swresample: reuse COMMON_CORE asm where possible

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

ff_put_wav_header: remove manual byte counting

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

swresample: change COMMON_CORE_INT16 asm from SSSE3 to SSE2

pshuf+paddd is slightly faster than phaddd.
The real gain is in pre-ssse3 processors like AMD K8 and K10, which get
a big boost in performance compared to the mmxext version

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  svq3: directly set pix_fmt and color_range

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

Merge commit 'ca80e15814b77efe8d0ff5a5b0220754bb6c4065'

* commit 'ca80e15814b77efe8d0ff5a5b0220754bb6c4065':
  mpegts: Forward error codes in various functions

Conflicts:
libavformat/mpegts.c

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

Merge commit '86ba2327e1cf35c6f77d5fb516a1a7a8dce0b98a'

* commit '86ba2327e1cf35c6f77d5fb516a1a7a8dce0b98a':
  mpegts: K&R formatting cosmetics

Conflicts:
libavformat/mpegts.c

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

float_dsp: add test program and use it as fate test

sbrdsp: move #if to disable all educational code

Avoids a warning of the unused function 'autocorrelate'.

lavc: er: remove unused variable size

The code using it was removed in d66e305bd1b.

svq3: directly set pix_fmt and color_range

mpegts: Forward error codes in various functions

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

mpegts: K&R formatting cosmetics

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

avfilter/src_movie: Check that the pixel format hasnt changed

Fixes assertion failure

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

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Fix TARGET_SAMPLES and TARGET_PATH for some fate tests.

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

MAINTAINERS: add myself az mpegts demuxer maintainer

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

avcodec/utils: fix sizeof(AVFrame) dependence in  avcodec_encode_audio2()

This is a bit tricky, we allocate a correctly sized AVFrame but then only
copy the compile time AVFrame size, this is to ensure that user applications
which do not use the correct av frame API dont end with out of array reads.
Note, applications using the correct API have set extended_data and the
changed code will never be executed for them.

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

Fix TARGET_SAMPLES and TARGET_PATH for some fate tests.

This allows running more fate tests on remote targets
without the source tree.

x86/synth_filter: improve FMA version

Replace mulps+subps with fnmaddps, resulting in two less instructions inside the
inner loops.
About 1% faster FMA3 performance.

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

doc/examples: Add example transcoding.c

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

avformat/mov: call mov_rewrite_dvd_sub_extradata() after parsing dimensions from tkhd

This also moves mov_rewrite_dvd_sub_extradata() to mov.c

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

avformat/mov: fill in subtitle dimensions after parsing tkhd

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

avformat/isom: only write the size if its non zero in mov_rewrite_dvd_sub_extradata()

Fixes regression with NeroRecodeSample.mp4

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

avformat/isom: Simplify mov_rewrite_dvd_sub_extradata()

This avoids the 2nd buffer and fixes the palette truncated check

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libx264: check color_range

Conflicts:
libavcodec/libx264.c

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

Merge commit 'bf0d7da7cbbf869605086c2a47cdf87f0a533e24'

* commit 'bf0d7da7cbbf869605086c2a47cdf87f0a533e24':
  ljpeg: check color_range

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

Merge commit '2183432e6dc8aedf1ef3db63006a2a8195479abd'

* commit '2183432e6dc8aedf1ef3db63006a2a8195479abd':
  mdec: set color_range

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

Merge commit '1c1fbc70cae44c10af8ff865826e31c17bc9f347'

* commit '1c1fbc70cae44c10af8ff865826e31c17bc9f347':
  mjpeg: set color_range

Conflicts:
libavcodec/mjpegdec.c

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

Merge commit '6612a03d7470af4aa6b8aa313b1eff013691d181'

* commit '6612a03d7470af4aa6b8aa313b1eff013691d181':
  fraps: set color_range

Conflicts:
libavcodec/fraps.c

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

Merge commit '5b1b91cfb82d56c09846c68b09d2b8b7c8faccc4'

* commit '5b1b91cfb82d56c09846c68b09d2b8b7c8faccc4':
  tiff: Support rgba encoding

Conflicts:
libavcodec/tiffenc.c

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

Merge commit '6d78e852fbf3cab438a2085bcb64b90457c4a851'

* commit '6d78e852fbf3cab438a2085bcb64b90457c4a851':
  img2: add j2c file extension

Conflicts:
libavformat/img2enc.c

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

Merge commit '58c215961a9067bb670387bbd72286c30de04b93'

* commit '58c215961a9067bb670387bbd72286c30de04b93':
  raw, nut: Support rgba64 encoding

Conflicts:
libavcodec/raw.c
libavformat/nut.c

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

Merge commit 'cccac7654f3f6b82967bc6ae08b35ae8b4fbe1a9'

* commit 'cccac7654f3f6b82967bc6ae08b35ae8b4fbe1a9':
  png: Support rgb48 and rgba64 encoding

Conflicts:
libavcodec/pngenc.c

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

Merge commit 'c598b569fb3d1f4b6c4868fe64f6989254df5186'

* commit 'c598b569fb3d1f4b6c4868fe64f6989254df5186':
  png: K&R formatting cosmetics

Conflicts:
libavcodec/png.c
libavcodec/pngdec.c
libavcodec/pngenc.c

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

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>

libx264: check color_range

ljpeg: check color_range

mdec: set color_range

mjpeg: set color_range

fraps: set color_range

tiff: Support rgba encoding

img2: add j2c file extension

Some applications use the j2c extension for jpeg2000 codestream files.

raw, nut: Support rgba64 encoding

png: Support rgb48 and rgba64 encoding

png: K&R formatting cosmetics

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>