Merge remote-tracking branch 'qatar/master'

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

Conflicts:
libavcodec/vp3.c

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

VP3: K&R formatting cosmetics

Merge commit '66d04c068a30751750818dcfbb6555ab74eb3f6d'

* commit '66d04c068a30751750818dcfbb6555ab74eb3f6d':
  fate: Explicitly use gray16le in fate-sgi-gray16

Conflicts:
tests/fate/image.mak

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

avcodec/ac3dec_fixed: add missingAVprefix to CODEC_ID

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Nedeljko Babic <nbabic@mips.com>

avcodec/ac3dec: avoid #if, use if() instead, its cleaner and shorter

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Nedeljko Babic <nbabic@mips.com>

avcodec/ac3: rename identifier used to select the fixed point variant

the CONFIG_ prefix is used by configure, using it for other things
is potentially confusing to the reader

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Nedeljko Babic <nbabic@mips.com>

libavcodec: Implementation of AC3 fixedpoint decoder

Signed-off-by: Nedeljko Babic <nbabic@mips.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avutil/fixed_dsp: remove redundant cast

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

libavutil: Add fixed_dsp

Signed-off-by: Nedeljko Babic <nbabic@mips.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/jpeglsdec: add PAL8 support

Fixes Ticket3478

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

fate: Explicitly use gray16le in fate-sgi-gray16

This fixes the test on big endian.

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

avcodec/exr: use av_freep() for saftey

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

Makefile: fix out of tree builds of .m files

should fix fate failures on darwin

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: add SGI tests

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

Merge commit 'd613091f8858d87789916e2bd7a84ea3144077d4'

* commit 'd613091f8858d87789916e2bd7a84ea3144077d4':
  sgi: decode 16bit RLE images

Conflicts:
Changelog

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

Merge commit '6c1df1f2287401b6022773e382ebc3a3bfed0b38'

* commit '6c1df1f2287401b6022773e382ebc3a3bfed0b38':
  sgi: encode images with 4 channels at 8 and 16 bits

Conflicts:
Changelog
libavcodec/sgienc.c

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

Merge commit 'f8dea10d3f09376894613d0266c34d1a16ac735f'

* commit 'f8dea10d3f09376894613d0266c34d1a16ac735f':
  sgi: decode images with 4 channels at 8 and 16 bits

Conflicts:
Changelog

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

Merge commit 'ab7c64624a1254d509b71c2a4945336567e93845'

* commit 'ab7c64624a1254d509b71c2a4945336567e93845':
  sgi: remove redundant argument from read_uncompressed_sgi()

Conflicts:
libavcodec/sgidec.c

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

Merge commit '6d9ccee4519f41155c88655c77bfb1ef085797fd'

* commit '6d9ccee4519f41155c88655c77bfb1ef085797fd':
  sgi: set the row boundary to the correct value

Conflicts:
libavcodec/sgidec.c

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

Merge commit '0279d1d0946a854aa08919abd05b7f2da433823e'

* commit '0279d1d0946a854aa08919abd05b7f2da433823e':
  sgi: fix end of line boundary detection

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

Merge commit 'e7cd53bf662a93330810981f1d057bdf2ead669e'

* commit 'e7cd53bf662a93330810981f1d057bdf2ead669e':
  sgi: check maximum supported resolution

Conflicts:
libavcodec/sgienc.c

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

Merge commit 'a7dbfcf6cb6ab8a8981d74332fd02fb90360d22f'

* commit 'a7dbfcf6cb6ab8a8981d74332fd02fb90360d22f':
  sgi: K&R formatting cosmetics

Conflicts:
libavcodec/sgidec.c
libavcodec/sgienc.c

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

Merge commit 'ca36aa9e6b8f2fed15478245ad533fc594a35c37'

* commit 'ca36aa9e6b8f2fed15478245ad533fc594a35c37':
  codec_desc: set lossless attribute for SGI and DPX

Conflicts:
libavcodec/codec_desc.c

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

Merge commit '06688e96fb9577bc7466a380bf7a14fa745208db'

* commit '06688e96fb9577bc7466a380bf7a14fa745208db':
  fate: add exr tests

Conflicts:
tests/fate/image.mak

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

Merge commit '38389058c3308758c6365abd0f6b45c5e62bb90b'

* commit '38389058c3308758c6365abd0f6b45c5e62bb90b':
  OpenEXR decoder

Conflicts:
Changelog
configure
libavcodec/Makefile
libavcodec/avcodec.h
libavcodec/exr.c
libavcodec/version.h

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

Merge commit '678e455f1dc09265464b13d936d9fda62bc2bf43'

* commit '678e455f1dc09265464b13d936d9fda62bc2bf43':
  dxva2: Directly use AVFrames

Conflicts:
libavcodec/dxva2_h264.c

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

fate: add SGI tests

sgi: decode 16bit RLE images

sgi: encode images with 4 channels at 8 and 16 bits

sgi: decode images with 4 channels at 8 and 16 bits

sgi: remove redundant argument from read_uncompressed_sgi()

sgi: set the row boundary to the correct value

avcodec/mjpegdec: fix cmyk 420 with adobe_transform == 2

Fixes Ticket3516

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

sgi: fix end of line boundary detection

sgi: check maximum supported resolution

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

sgi: K&R formatting cosmetics

codec_desc: set lossless attribute for SGI and DPX

fate: add exr tests

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

OpenEXR decoder

Additional fixes and enhancements by Vittorio Giovara, Gonzalo Garramuno,
Nicolas George, Paul B Mahol and Michael Niedermayer.

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

dxva2: Directly use AVFrames

The assumption of (MPEG) Picture and H264Picture layout matching might
not hold true in the future.

Signed-off-by: Hendrik Leppkes <h.leppkes@gmail.com>

avformat/img2dec: zero probe buffer

Fixes use of uninitialized memory
Fixes valgrind failure

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

dshow: fixup some COM objects, based on patches from Don Moir

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavd/qtkit: Fix non-constant initializer element for some clang compilers.

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mov: Unbreak sbtl writing

Conflicts:
libavformat/movenc.c

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

Merge commit '654c7446a806c5dc8ec7800874c49a4c1ba2ce80'

* commit '654c7446a806c5dc8ec7800874c49a4c1ba2ce80':
  vc1dec: improve hwaccel #ifdefs

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

Merge commit '33259118155764ce27a3433894659dda1d148b5f'

* commit '33259118155764ce27a3433894659dda1d148b5f':
  h263: improve hwaccel #ifdefs

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

Merge commit 'c042cbc3a68d09a20cfd75fb4a4eff0534253081'

* commit 'c042cbc3a68d09a20cfd75fb4a4eff0534253081':
  libx265: Use the repeat headers flag when not using global headers

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

Merge commit 'cd60631752cafe106b406f00966ac0323ad2ce1f'

* commit 'cd60631752cafe106b406f00966ac0323ad2ce1f':
  libx265: Bump version requirement

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

mov: Unbreak sbtl writing

vc1dec: improve hwaccel #ifdefs

h263: improve hwaccel #ifdefs

avcodec/mjpegdec: support subsampled 420 CMYK

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

avcodec/mjpegdec: upgrade upscale_v to support multiple planes

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

avcodec/mjpegdec: upgrade upscale_h to support multiple planes

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

libx265: Use the repeat headers flag when not using global headers

This allows proper muxing and seeking in things like MPEG-TS, by
placing headers by random access points.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

libx265: Bump version requirement

Build 13 has a crucial fix which makes x265_encode_headers work
as its always been documented.

Previous to this, the check was incorrect.

Also allows for use of the repeat headers flag.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

libx265: Use the repeat headers flag when not using global headers

This allows proper muxing and seeking in things like MPEG-TS, by
placing headers by random access points.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

libx265: Bump version requirement

Build 13 has a crucial fix which makes x265_encode_headers work
as its always been documented.

Previous to this, the check was incorrect.

Also allows for use of the repeat headers flag.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

avcodec/adpcm: also squelch 'mismatch in coded sample count' warning for AV_CODEC_ID_ADPCM_EA_R1

AV_CODEC_ID_ADPCM_EA_R1/R2/R3 all use an internal offset. For some
samples there is padding between the offset table and ADPCM data.

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

configure: Remove invalid option --disable-qtkit.

QTKit can/should be disabled by "--disable-indev=qtkit".

Found by Justin Derrick.

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

avfilter/vf_pullup: fix gray8

Fixes segfault
Fixes Ticket3469

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libmp3lame: add ABR support

Conflicts:
libavcodec/libmp3lame.c
libavcodec/version.h

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

Merge commit '292dbe5e8a95d38c1324b0432fbaca67f8fe4b73'

* commit '292dbe5e8a95d38c1324b0432fbaca67f8fe4b73':
  libmp3lame: add comments about CBR/VBR modes

Conflicts:
libavcodec/libmp3lame.c

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

Merge commit '729d821fd864a0568f4068e64d3a70faa23b9309'

* commit '729d821fd864a0568f4068e64d3a70faa23b9309':
  libmp3lame: allow joint stereo to be disabled

Conflicts:
libavcodec/libmp3lame.c
libavcodec/version.h

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

Merge commit '12789d96361ed8e9804bfbb9db31ea4110e75c58'

* commit '12789d96361ed8e9804bfbb9db31ea4110e75c58':
  mov: call mov_rewrite_dvd_sub_extradata() after parsing dimensions from tkhd

Conflicts:
libavformat/isom.c

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

Merge commit 'fce28c3c6d603b7f42a5dbe36bf240d0470469c8'

* commit 'fce28c3c6d603b7f42a5dbe36bf240d0470469c8':
  mov: fill in subtitle dimensions after parsing tkhd

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

Merge commit '96138e8c8da4b9397e627c934a33c22988d1192b'

* commit '96138e8c8da4b9397e627c934a33c22988d1192b':
  isom: only write the size if its non zero in mov_rewrite_dvd_sub_extradata()

Conflicts:
libavformat/isom.c

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

Merge commit '9bd4a9f4eec8c8843b54126253bb9d77af95bbb3'

* commit '9bd4a9f4eec8c8843b54126253bb9d77af95bbb3':
  isom: Simplify mov_rewrite_dvd_sub_extradata()

Conflicts:
libavformat/isom.c

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

Merge commit '3e4e2142d246699a1a3a0045ba7124b18bc34d7a'

* commit '3e4e2142d246699a1a3a0045ba7124b18bc34d7a':
  fate: Convert the paletted output in the brenderpix tests to rgb24

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

libmp3lame: add ABR support

libmp3lame: add comments about CBR/VBR modes

libmp3lame: allow joint stereo to be disabled

mov: call mov_rewrite_dvd_sub_extradata() after parsing dimensions from tkhd

This also moves mov_rewrite_dvd_sub_extradata() to mov.c.

Sample-Id: NeroRecodeSample.mp4

mov: fill in subtitle dimensions after parsing tkhd

Sample-Id: NeroRecodeSample.mp4

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

Sample-Id: NeroRecodeSample.mp4

isom: Simplify mov_rewrite_dvd_sub_extradata()

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

fate: Convert the paletted output in the brenderpix tests to rgb24

This makes the output consistent on big-endian systems.

Use intel compliant CDQ instead of CLTD in inline asm.

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

doc/indevs: Fix example for QTKit usage.

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avconv: make the ASCII flow charts narrower to fit onto TTY

Conflicts:
doc/ffmpeg.texi

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

Merge commit '68e95ab81be1aa3f47ab148dceb8711ef5f4212d'

* commit '68e95ab81be1aa3f47ab148dceb8711ef5f4212d':
  dnxhdenc: return meaningful return codes

Conflicts:
libavcodec/dnxhdenc.c

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

Merge commit '9e4e35b4d7c43a908944183a58aa389a23116fd6'

* commit '9e4e35b4d7c43a908944183a58aa389a23116fd6':
  avconv_opt: fix avio_open2() return code check

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

lavd: Add QTKit input device.

Signed-off-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avconv: make the ASCII flow charts narrower to fit onto TTY

These charts in man page are currently destroyed.

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

avformat/wtvenc: advise user when H264 startcode is not present

Fixes ticket #3473.

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

avformat/mpegtsenc: move startcode validity check to ff_check_h264_startcode

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

avformat/avio: also set generic URL context options

This should have no effect currently as there are no such options yet.

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

avutil/opt: dont crash on av_opt_set_dict() with NULL

This allows calling the function without the need to check if the
dictionary contains any entries

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

dnxhdenc: return meaningful return codes

avconv_opt: fix avio_open2() return code check

avio_open2() only return < 0 when error.

avformat/wtvenc: pad judiciously when writing mpeg2 extradata

Padding rule described here http://msdn.microsoft.com/en-us/library/windows/desktop/dd390707(v=vs.85).aspx

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

avformat/wtvdec: demux mpeg2 extradata

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

avformat/replaygain: remove unused variable

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  golomb: Fix the implementation of get_se_golomb_long

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

Merge commit '53c20f17c78d1d8a0fc2505868f201e69ff59cc5'

* commit '53c20f17c78d1d8a0fc2505868f201e69ff59cc5':
  vp8: K&R formatting cosmetics

Conflicts:
libavcodec/vp8.c
libavcodec/vp8.h
libavcodec/vp8data.h
libavcodec/vp8dsp.c

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

golomb: Fix the implementation of get_se_golomb_long

This was only used in hevc muxing code so far.

This makes the return values match what get_se_golomb returns for
the same bitstream reader instances.

The logic for producing a signed golomb code out of an unsigned one
was based on the corresponding code in get_se_golomb, which operated
directly on the bitstream reader buffer - not on the equivalent
return value from get_ue_golomb.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>

avcodec/vp9dsp: fix typo in mc doxy.

x86/vp9mc: add vp9 namespace.

Merge commit 'lukaszmluki/master^'

* commit 'lukaszmluki/master^':
  lavd/pulse_audio_enc: implement get_device_list callback
  lavd/pulse_audio_dec: implement get_device_list callback
  lavd/pulse_audio_common: add device detecting code
  lavu/mem: add av_dynarray_add_nofree function
  lavd/pulse_audio_enc: implement write_uncoded_frame callback
  tools/uncoded_frame: fix audio codec generation

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

vp8: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>