ffmpeg.git
5 years agoavcodec/mjpegenc: pass chroma quantization matrix through as well, not just luma
Michael Niedermayer [Sat, 11 Jan 2014 20:26:51 +0000 (21:26 +0100)]
avcodec/mjpegenc: pass chroma quantization matrix through as well, not just luma

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 11 Jan 2014 19:40:35 +0000 (20:40 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  flv: Workaround for buggy Omnia A/XE encoder

Conflicts:
libavformat/flvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohevc: Clip the pixel before shifting
Luca Barbato [Sat, 11 Jan 2014 15:52:41 +0000 (16:52 +0100)]
hevc: Clip the pixel before shifting

Prevent an out of array bound read.

Fixes: asan_stack-oob_eae8e3_7333_WPP_B_ericsson_MAIN10_2.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/hevc: use av_mallocz() for allocating tab_ipm
Michael Niedermayer [Sat, 11 Jan 2014 19:23:51 +0000 (20:23 +0100)]
avcodec/hevc: use av_mallocz() for allocating tab_ipm

Fixes use of uninitialized memory and out of stack array read
Fixes: signal_sigsegv_ecc526_7846_WPP_C_ericsson_MAIN_2.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoflv: Workaround for buggy Omnia A/XE encoder
Benjamin Larsson [Sun, 5 Jan 2014 13:42:14 +0000 (14:42 +0100)]
flv: Workaround for buggy Omnia A/XE encoder

The Omnia A/XE encoder writes the explicit extra data incorrectly
and wrongly disables parametric stereo. Truncating the extra data
by setting the size to 2 works around this. The AAC extra data
parser will then only parse the correct parts.

Bug-id: 599

5 years agoavcodec/alac: warn if not all channels where decoded
Michael Niedermayer [Sat, 11 Jan 2014 03:44:42 +0000 (04:44 +0100)]
avcodec/alac: warn if not all channels where decoded

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/alac: only set *got_frame_ptr when all channels have been decoded
Michael Niedermayer [Sat, 11 Jan 2014 03:36:15 +0000 (04:36 +0100)]
avcodec/alac: only set *got_frame_ptr when all channels have been decoded

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f8b64436530_7895_quicktime_newcodec_applelosslessaudiocodec.m4a
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 11 Jan 2014 02:07:31 +0000 (03:07 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  arm: Add an option for making sure NEON registers aren't clobbered

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/pjsdec: dont increase pointer when its already at the end in read_ts()
Clément Bœsch [Fri, 10 Jan 2014 00:51:22 +0000 (01:51 +0100)]
avformat/pjsdec: dont increase pointer when its already at the end in read_ts()

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f91f2de7764_2649_PJS_capability_tester.pjs
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/wmalosslessdec: shrink output on error so no uninitialized data is returned
Michael Niedermayer [Sat, 11 Jan 2014 01:04:01 +0000 (02:04 +0100)]
avcodec/wmalosslessdec: shrink output on error so no uninitialized data is returned

Fixes use of uninitialized memory
partly fixes: msan_uninit-mem_7f7834b6a530_6473_luckynight-partial.wma
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/wmalosslessdec: deallocate uninitialized frame on decode_tilehdr() failure
Michael Niedermayer [Sat, 11 Jan 2014 00:59:20 +0000 (01:59 +0100)]
avcodec/wmalosslessdec: deallocate uninitialized frame on decode_tilehdr() failure

Fixes use of uninitialized memory
partly fixes: msan_uninit-mem_7f7834b6a530_6473_luckynight-partial.wma
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/wmalosslessdec: Pass on error code from decode_tilehdr()
Michael Niedermayer [Sat, 11 Jan 2014 00:58:36 +0000 (01:58 +0100)]
avcodec/wmalosslessdec: Pass on error code from decode_tilehdr()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Fri, 10 Jan 2014 23:14:27 +0000 (00:14 +0100)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Cast signed libopenjpeg data values to unsigned before shifting.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoCast signed libopenjpeg data values to unsigned before shifting.
Carl Eugen Hoyos [Fri, 10 Jan 2014 23:03:37 +0000 (00:03 +0100)]
Cast signed libopenjpeg data values to unsigned before shifting.

This avoids undefined behaviour on left-shift.

Reviewed-by: Michael Bradshaw
5 years agovdpau: restore compatibility with deprecated fields in AVVDPAUContext
Hendrik Leppkes [Fri, 10 Jan 2014 19:18:08 +0000 (20:18 +0100)]
vdpau: restore compatibility with deprecated fields in AVVDPAUContext

Fixes ticket #3133.

Signed-off-by: Hendrik Leppkes <h.leppkes@gmail.com>
Tested-by: EricV
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/matroskadec: check generic audio deinterleaver sub_packet_size against frame...
Michael Niedermayer [Fri, 10 Jan 2014 22:10:47 +0000 (23:10 +0100)]
avformat/matroskadec: check generic audio deinterleaver sub_packet_size against frame_size

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f67d052a530_7517_nosound.mkv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoarm: Add an option for making sure NEON registers aren't clobbered
Martin Storsjö [Fri, 20 Dec 2013 11:51:50 +0000 (13:51 +0200)]
arm: Add an option for making sure NEON registers aren't clobbered

This is pretty much based on the same test for XMM registers.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 10 Jan 2014 20:06:15 +0000 (21:06 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: Explicitly specify the rgb555le pixel format for the mss2 rgb555 tests

See: 34e90b2e6d66c511bea872bcb3a0e34b482b8c17
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/flvdec: initialize context before reading from it
Michael Niedermayer [Fri, 10 Jan 2014 19:58:19 +0000 (20:58 +0100)]
avformat/flvdec: initialize context before reading from it

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f9b8387069e_5377_flv_with_pcm_s16be_audio_track.flv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agonut: Support XYZ12 rawvideo
Michael Niedermayer [Fri, 10 Jan 2014 16:50:33 +0000 (17:50 +0100)]
nut: Support XYZ12 rawvideo

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswscale: fix rgb48Toxyz12() endianness
Michael Niedermayer [Fri, 10 Jan 2014 16:23:04 +0000 (17:23 +0100)]
swscale: fix rgb48Toxyz12() endianness

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mss2: fix chroma dimensions
Michael Niedermayer [Fri, 10 Jan 2014 15:56:37 +0000 (16:56 +0100)]
avcodec/mss2: fix chroma dimensions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agofate: Explicitly specify the rgb555le pixel format for the mss2 rgb555 tests
Martin Storsjö [Fri, 10 Jan 2014 14:05:10 +0000 (16:05 +0200)]
fate: Explicitly specify the rgb555le pixel format for the mss2 rgb555 tests

This fixes these fate tests on big endian.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoavformat/avisynth simplify packet allocation
Michael Niedermayer [Thu, 9 Jan 2014 17:33:39 +0000 (18:33 +0100)]
avformat/avisynth simplify packet allocation

Reviewed-by: Stephen Hutchinson <qyot27@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoFix libopenjpeg colour range adjust for 8<bpp<16.
Carl Eugen Hoyos [Fri, 10 Jan 2014 09:57:43 +0000 (10:57 +0100)]
Fix libopenjpeg colour range adjust for 8<bpp<16.

Fixes ticket #3284.

Reviewed-by: Michael Bradshaw
5 years agoSupport signed j2k images via libopenjpeg.
Carl Eugen Hoyos [Fri, 10 Jan 2014 09:55:51 +0000 (10:55 +0100)]
Support signed j2k images via libopenjpeg.

Fixes ticket #3283.

Reviewed-by: Michael Bradshaw
5 years agoUnscaled 16bit packed RGB to planar GBR converter.
Carl Eugen Hoyos [Fri, 10 Jan 2014 09:47:46 +0000 (10:47 +0100)]
Unscaled 16bit packed RGB to planar GBR converter.

Fixes r210(rgb48) -> ffv1 (gbrp10) -> r210 roundtrip
as reported by forum user JasonCA.

5 years agofate: fix MSS2 tests on big endian
Michael Niedermayer [Fri, 10 Jan 2014 04:51:15 +0000 (05:51 +0100)]
fate: fix MSS2 tests on big endian

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 10 Jan 2014 02:57:46 +0000 (03:57 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avutil: do not use avcodec header in frame.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'abb5e37f64c48bba8bd0fde2bada0f7544defa24'
Michael Niedermayer [Fri, 10 Jan 2014 02:46:28 +0000 (03:46 +0100)]
Merge commit 'abb5e37f64c48bba8bd0fde2bada0f7544defa24'

* commit 'abb5e37f64c48bba8bd0fde2bada0f7544defa24':
  avfilter: fix leaks on error in ff_filter_frame

Conflicts:
libavfilter/avfilter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '5655732c77f2df9c1dfbddc30cd4844390a6921f'
Michael Niedermayer [Fri, 10 Jan 2014 02:36:42 +0000 (03:36 +0100)]
Merge commit '5655732c77f2df9c1dfbddc30cd4844390a6921f'

* commit '5655732c77f2df9c1dfbddc30cd4844390a6921f':
  avfilter: add needs_writable field to the internal AVFilterPad structure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd44bd7fb27d4121512eae0ffce5e48bac25e82dc'
Michael Niedermayer [Fri, 10 Jan 2014 02:34:31 +0000 (03:34 +0100)]
Merge commit 'd44bd7fb27d4121512eae0ffce5e48bac25e82dc'

* commit 'd44bd7fb27d4121512eae0ffce5e48bac25e82dc':
  avfilter: add documentation for needs_writable

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '11d704dc94c029058ac366f85951f6728638fb9c'
Michael Niedermayer [Fri, 10 Jan 2014 02:24:02 +0000 (03:24 +0100)]
Merge commit '11d704dc94c029058ac366f85951f6728638fb9c'

* commit '11d704dc94c029058ac366f85951f6728638fb9c':
  fate: add framepack filter test

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a7d0e7ead95e584c4866617f046b2493066975c6'
Michael Niedermayer [Fri, 10 Jan 2014 01:53:15 +0000 (02:53 +0100)]
Merge commit 'a7d0e7ead95e584c4866617f046b2493066975c6'

* commit 'a7d0e7ead95e584c4866617f046b2493066975c6':
  lavfi: add framepack filter

Conflicts:
Changelog
doc/filters.texi
libavfilter/allfilters.c
libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'aa69cbc9e08281db6ecb98a2c8b4f60e8b12e558'
Michael Niedermayer [Fri, 10 Jan 2014 01:32:12 +0000 (02:32 +0100)]
Merge commit 'aa69cbc9e08281db6ecb98a2c8b4f60e8b12e558'

* commit 'aa69cbc9e08281db6ecb98a2c8b4f60e8b12e558':
  flac muxer: add option to disable writing the global header

Conflicts:
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mxfdec: check avio_read(UID) result
Michael Niedermayer [Fri, 10 Jan 2014 01:11:20 +0000 (02:11 +0100)]
avformat/mxfdec: check avio_read(UID) result

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7fc9ba2fd98e_82_02785736.mxf
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/nutdec: fix packet end clearing
Michael Niedermayer [Thu, 9 Jan 2014 23:32:39 +0000 (00:32 +0100)]
avformat/nutdec: fix packet end clearing

The code was buggy, using the wrong variable, also it missed the case
where the packet become smaller due to sidedata/metadata being extracted
which left a few bytes uninitialized

Fixes use of uninitialized memory
Fixed: msan_uninit-mem_7f6abbe44530_6838_mewmew_vorbis_ssa.nut
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/rmdec: when reading audio blocks, dont leave holes when reading fails
Michael Niedermayer [Thu, 9 Jan 2014 21:59:51 +0000 (22:59 +0100)]
avformat/rmdec: when reading audio blocks, dont leave holes when reading fails

The fate test is changed because the reference file depends on the use of
non cleared data at the very
end. Alternatively we could upload a new reference file, though that would
then have to be changed every time the handling of a truncated frame changes
or theres a change to error concealment, each time adding a new file ...

Fixes use of uninitialized memory
Fixed: msan_uninit-mem_7f3c02b81363_2787_RLG2_19.rm
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil: do not use avcodec header in frame.h
Vittorio Giovara [Wed, 8 Jan 2014 00:20:18 +0000 (01:20 +0100)]
avutil: do not use avcodec header in frame.h

5 years agoavfilter: fix leaks on error in ff_filter_frame
Vittorio Giovara [Wed, 18 Dec 2013 10:45:01 +0000 (11:45 +0100)]
avfilter: fix leaks on error in ff_filter_frame

5 years agoavfilter: add needs_writable field to the internal AVFilterPad structure
Vittorio Giovara [Wed, 18 Dec 2013 13:21:25 +0000 (14:21 +0100)]
avfilter: add needs_writable field to the internal AVFilterPad structure

5 years agoavfilter: add documentation for needs_writable
Vittorio Giovara [Wed, 18 Dec 2013 10:40:38 +0000 (11:40 +0100)]
avfilter: add documentation for needs_writable

5 years agofate: add framepack filter test
Vittorio Giovara [Tue, 5 Nov 2013 15:00:49 +0000 (16:00 +0100)]
fate: add framepack filter test

5 years agolavfi: add framepack filter
Vittorio Giovara [Thu, 9 Jan 2014 18:50:19 +0000 (19:50 +0100)]
lavfi: add framepack filter

5 years agoflac muxer: add option to disable writing the global header
Justin Ruggles [Thu, 9 Jan 2014 17:11:26 +0000 (12:11 -0500)]
flac muxer: add option to disable writing the global header

The global header is not explicitly required for playback, and
omitting it allows for simple concatenation.

5 years agoavcodec/mjpegdec: allow lowres with amv
Michael Niedermayer [Thu, 9 Jan 2014 20:31:46 +0000 (21:31 +0100)]
avcodec/mjpegdec: allow lowres with amv

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mjpegdec: use the AVFrame width/height for flipping
Michael Niedermayer [Thu, 9 Jan 2014 20:30:49 +0000 (21:30 +0100)]
avcodec/mjpegdec: use the AVFrame width/height for flipping

This makes it possible to use the code with lowres

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mjpegdec: remove new flipping code
Michael Niedermayer [Thu, 9 Jan 2014 20:23:16 +0000 (21:23 +0100)]
avcodec/mjpegdec: remove new flipping code

It stored images wrong in the user provided buffers (that is you would
end up with a wrongly flipped image if you used direct rendering).
Also it used wrong dimensions as noticed by ubitux

Enable the old code unconditionally so flipping works correctly
again.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 9 Jan 2014 19:56:49 +0000 (20:56 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  ATRAC3+ decoder

Conflicts:
Changelog
configure
libavcodec/atrac3plus.c
libavcodec/atrac3plus.h
libavcodec/atrac3plus_data.h
libavcodec/atrac3plusdec.c
libavcodec/atrac3plusdsp.c
libavcodec/version.h

See: 2e1fb96af36348479e14aa85f445915ea09e70fa
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4c642d8d98703faf52983243098f35865e15b312'
Michael Niedermayer [Thu, 9 Jan 2014 19:32:43 +0000 (20:32 +0100)]
Merge commit '4c642d8d98703faf52983243098f35865e15b312'

* commit '4c642d8d98703faf52983243098f35865e15b312':
  x86: hpeldsp: Add missing av_cold attribute to init function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b0be1ae792ac8bbfb0fc7b9b9cb39eaf0feb489b'
Michael Niedermayer [Thu, 9 Jan 2014 19:24:10 +0000 (20:24 +0100)]
Merge commit 'b0be1ae792ac8bbfb0fc7b9b9cb39eaf0feb489b'

* commit 'b0be1ae792ac8bbfb0fc7b9b9cb39eaf0feb489b':
  x86: avcodec: Add a bunch of missing #includes for av_cold

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4b48201d4d9d57a2a1ecf8504bc928aff83cb99a'
Michael Niedermayer [Thu, 9 Jan 2014 19:14:10 +0000 (20:14 +0100)]
Merge commit '4b48201d4d9d57a2a1ecf8504bc928aff83cb99a'

* commit '4b48201d4d9d57a2a1ecf8504bc928aff83cb99a':
  ac3tab.h: #include the correct headers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoATRAC3+ decoder
Maxim Polijakowski [Fri, 3 Jan 2014 22:23:11 +0000 (23:23 +0100)]
ATRAC3+ decoder

Cleanup by Diego Biurrun.

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
5 years agodoc/examples/muxing: Fixes frame initialization.
Andre Anjos [Tue, 29 Oct 2013 10:28:26 +0000 (11:28 +0100)]
doc/examples/muxing: Fixes frame initialization.

Fixes use of the example with encoders which use tha AVFrame w/h/pix_fmt fields
FFV1 is one of these codecs

We cannot easily workaround the not set fields in common code because the API
has AVFrame constant for the encoders.
Alternatives would be to fix the API or to duplicate the struct and fill in
missing fields. Or as is to require all user apps to set this correctly and
maybe simplify for that case

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 9 Jan 2014 14:46:31 +0000 (15:46 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mjpegdec: apply flipping after decoding, not before

Conflicts:
libavcodec/mjpegdec.c
libavcodec/mjpegdec.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e588615d938f8581f0d6f3771662d08cadfc00de'
Michael Niedermayer [Thu, 9 Jan 2014 14:10:31 +0000 (15:10 +0100)]
Merge commit 'e588615d938f8581f0d6f3771662d08cadfc00de'

* commit 'e588615d938f8581f0d6f3771662d08cadfc00de':
  hevc: fix decoding of one PU wide files

Conflicts:
libavcodec/hevc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agox86: hpeldsp: Add missing av_cold attribute to init function
Diego Biurrun [Thu, 9 Jan 2014 13:06:32 +0000 (14:06 +0100)]
x86: hpeldsp: Add missing av_cold attribute to init function

5 years agox86: avcodec: Add a bunch of missing #includes for av_cold
Diego Biurrun [Thu, 9 Jan 2014 13:06:31 +0000 (14:06 +0100)]
x86: avcodec: Add a bunch of missing #includes for av_cold

5 years agoac3tab.h: #include the correct headers
Diego Biurrun [Thu, 9 Jan 2014 13:06:30 +0000 (14:06 +0100)]
ac3tab.h: #include the correct headers

5 years agoMerge commit 'a246af86e47044dec243db2f708cc125d608ea78'
Michael Niedermayer [Thu, 9 Jan 2014 13:48:52 +0000 (14:48 +0100)]
Merge commit 'a246af86e47044dec243db2f708cc125d608ea78'

* commit 'a246af86e47044dec243db2f708cc125d608ea78':
  FATE: add MSS2 tests

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ca96e337169093979d7c763064ad9dae12b3108c'
Michael Niedermayer [Thu, 9 Jan 2014 13:39:13 +0000 (14:39 +0100)]
Merge commit 'ca96e337169093979d7c763064ad9dae12b3108c'

* commit 'ca96e337169093979d7c763064ad9dae12b3108c':
  vp9: drop support for real (non-emulated) edges

Conflicts:
libavcodec/vp9block.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ef8c93e2f18c624d0c266687e43ab99af7921dd3'
Michael Niedermayer [Thu, 9 Jan 2014 13:32:09 +0000 (14:32 +0100)]
Merge commit 'ef8c93e2f18c624d0c266687e43ab99af7921dd3'

* commit 'ef8c93e2f18c624d0c266687e43ab99af7921dd3':
  vp8: drop support for real (non-emulated) edges

Conflicts:
tests/fate/vpx.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ebfe622bb1ca57cecb932e42926745cba7161913'
Michael Niedermayer [Thu, 9 Jan 2014 13:12:19 +0000 (14:12 +0100)]
Merge commit 'ebfe622bb1ca57cecb932e42926745cba7161913'

* commit 'ebfe622bb1ca57cecb932e42926745cba7161913':
  mpegvideo: drop support for real (non-emulated) edges

Conflicts:
libavcodec/mpegvideo.c
libavcodec/mpegvideo_motion.c
libavcodec/wmv2.c

If this is slower on a major platform then it should be investigated
and potentially reverted.

See: 8fc52a5ef94712d900fc8fe7503cf9c9ba635143
See: 3969b4b861ce8152e3195e8f8c3437abd273b90a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc: remove encoder/muxer/sinks docs from ffplay- and ffprobe-all
Timothy Gu [Thu, 9 Jan 2014 05:19:52 +0000 (21:19 -0800)]
doc: remove encoder/muxer/sinks docs from ffplay- and ffprobe-all

ffplay and ffprobe are read-only.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
5 years agoexamples/muxing: set timestamps in output audio packet
Stefano Sabatini [Wed, 8 Jan 2014 14:43:25 +0000 (15:43 +0100)]
examples/muxing: set timestamps in output audio packet

In particular, fix trac ticket #3231.

5 years agoexamples/muxing: use av_frame_free() in place of av_free()
Stefano Sabatini [Thu, 9 Jan 2014 09:39:52 +0000 (10:39 +0100)]
examples/muxing: use av_frame_free() in place of av_free()

5 years agoexamples/muxing: reuse global audio frame
Stefano Sabatini [Wed, 8 Jan 2014 14:42:14 +0000 (15:42 +0100)]
examples/muxing: reuse global audio frame

Simplify logic, avoid multiple unnecessary alloc/free operations.

5 years agoexamples/muxing: honour distinction between encoder PTS timebase and stream timebase
Stefano Sabatini [Tue, 7 Jan 2014 12:03:39 +0000 (13:03 +0100)]
examples/muxing: honour distinction between encoder PTS timebase and stream timebase

Fix PTS set on the frame when encoding, which must be specified in the
encoder timebase or this will confuse the encoder.

When muxing the packet, the PTS/DTS generated by the encoder is then
rescaled to the stream timebase.

5 years agoexamples/muxing: set sample formats from list of codec supported sample formats
Stefano Sabatini [Tue, 7 Jan 2014 11:59:50 +0000 (12:59 +0100)]
examples/muxing: set sample formats from list of codec supported sample formats

Avoid the need of tweaking, also show how to get list of supported sample
formats.

5 years agomjpegdec: apply flipping after decoding, not before
Anton Khirnov [Fri, 20 Dec 2013 09:44:57 +0000 (10:44 +0100)]
mjpegdec: apply flipping after decoding, not before

This is simpler and removes a silly restriction on edges being present.

5 years agohevc: fix decoding of one PU wide files
Guillaume Martres [Fri, 3 Jan 2014 08:10:38 +0000 (09:10 +0100)]
hevc: fix decoding of one PU wide files

For those the block size may be larger than the source linesize (if the
edges are not allocated).

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoFATE: add MSS2 tests
Anton Khirnov [Tue, 17 Dec 2013 11:44:17 +0000 (12:44 +0100)]
FATE: add MSS2 tests

5 years agovp9: drop support for real (non-emulated) edges
Anton Khirnov [Fri, 20 Dec 2013 10:20:24 +0000 (11:20 +0100)]
vp9: drop support for real (non-emulated) edges

They are not measurably faster on x86, they might be somewhat faster on
other platforms due to missing emu edge SIMD, but the gain is not large
enough to justify the added complexity.

5 years agovp8: drop support for real (non-emulated) edges
Anton Khirnov [Fri, 20 Dec 2013 10:20:24 +0000 (11:20 +0100)]
vp8: drop support for real (non-emulated) edges

They are not measurably faster on x86, they might be somewhat faster on
other platforms due to missing emu edge SIMD, but the gain is not large
enough to justify the added complexity.

5 years agompegvideo: drop support for real (non-emulated) edges
Anton Khirnov [Fri, 20 Dec 2013 10:20:24 +0000 (11:20 +0100)]
mpegvideo: drop support for real (non-emulated) edges

Several decoders disable those anyway and they are not measurably faster
on x86. They might be somewhat faster on other platforms due to missing
emu edge SIMD, but the gain is not large enough (and those decoders
relevant enough) to justify the added complexity.

5 years agoavcodec/msvideo1enc: fix SKIPS_MAX
Michael Niedermayer [Thu, 9 Jan 2014 03:02:58 +0000 (04:02 +0100)]
avcodec/msvideo1enc: fix SKIPS_MAX

Fixes Ticket3270

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter: avfilter_register() that works in O(1) time
Michael Niedermayer [Sun, 8 Dec 2013 01:27:11 +0000 (02:27 +0100)]
avfilter: avfilter_register() that works in O(1) time

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/filters: add rotate example using degrees
Lou Logan [Wed, 8 Jan 2014 19:36:18 +0000 (10:36 -0900)]
doc/filters: add rotate example using degrees

5 years agoavformat/udp: debug log udp socket size
rogerdpack [Mon, 6 Jan 2014 19:57:52 +0000 (12:57 -0700)]
avformat/udp: debug log udp socket size

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/libstagefright: drop dependancy on sizeof(AVFrame)
Michael Niedermayer [Tue, 17 Dec 2013 15:27:36 +0000 (16:27 +0100)]
avcodec/libstagefright: drop dependancy on sizeof(AVFrame)

untested (noone tested within about a month) and the change is
quite trivial so should be ok. While the code before this change
is broken.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/kgv1dec: remove unused function and variable
Michael Niedermayer [Wed, 8 Jan 2014 19:15:22 +0000 (20:15 +0100)]
avcodec/kgv1dec: remove unused function and variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswscale: disable ARM code until its build failure with clang/iphone is fixed
Michael Niedermayer [Wed, 8 Jan 2014 16:12:22 +0000 (17:12 +0100)]
swscale: disable ARM code until its build failure with clang/iphone is fixed

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agovp9/x86: make STORE_2X2 macro local.
Ronald S. Bultje [Wed, 8 Jan 2014 12:22:50 +0000 (07:22 -0500)]
vp9/x86: make STORE_2X2 macro local.

Prevents this assembler warning:
libavcodec/x86/vp9itxfm.asm:1208: warning: (VP9_IDCT32_1D:309)
redefining multi-line macro `STORE_2X2'

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/huffyuvenc: Factorize store_huffman_tables() out
Michael Niedermayer [Wed, 8 Jan 2014 13:00:14 +0000 (14:00 +0100)]
avcodec/huffyuvenc: Factorize store_huffman_tables() out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/ffv1enc: choose 1.2 by default for higher resolutions to ensure multi-threade...
Michael Niedermayer [Sun, 8 Dec 2013 15:39:35 +0000 (16:39 +0100)]
avcodec/ffv1enc: choose 1.2 by default for higher resolutions to ensure multi-threaded decodability

Reviewed-by: "Peter B." <pb@das-werkstatt.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'rbultje/vp9-simd'
Michael Niedermayer [Wed, 8 Jan 2014 12:02:38 +0000 (13:02 +0100)]
Merge remote-tracking branch 'rbultje/vp9-simd'

* rbultje/vp9-simd:
  vp9: make mv bounds 32bit.
  vp9: reset contextual caches on frame size change with mt enabled.
  vp9/x86: idct_32x32_add_ssse3 sub-8x8-idct.
  vp9/x86: idct_32x32_add_ssse3 sub-16x16-idct.
  vp9/x86: idct_32x32_add_ssse3.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavisynth: Use av_packet_from_data instead of av_new_packet
Stephen Hutchinson [Wed, 8 Jan 2014 05:37:57 +0000 (00:37 -0500)]
avisynth: Use av_packet_from_data instead of av_new_packet

If the audio changes from 9eac7c4 were merged as they were, this
would cause scripts with both video+audio to fail with a lot of
audio decoding errors (the video would be fine). Scripts with
only one of either video or audio were unaffected. Additionally,
the av_packet changes in general caused seeking to break.

Using av_packet_from_data allows video+audio scripts to work as
expected, without audio decoding errors.  It also fixes seeking.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavisynth: More av_new_packet changes
Anton Khirnov [Wed, 8 Jan 2014 05:37:56 +0000 (00:37 -0500)]
avisynth: More av_new_packet changes

These are the remaining av_packet-related bits from 9eac7c4
that didn't get merged at that time.

Changes authored by Anton Khirnov <anton@khirnov.net>, split out
from 9eac7c4 by Stephen Hutchinson <qyot27@gmail.com>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/huffyuvenc: fix -context 1 encoding
Michael Niedermayer [Wed, 8 Jan 2014 11:38:57 +0000 (12:38 +0100)]
avcodec/huffyuvenc: fix -context 1 encoding

Fixes Ticket3281

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/muxers/image2: apply several formatting changes
Stefano Sabatini [Wed, 8 Jan 2014 09:13:15 +0000 (10:13 +0100)]
doc/muxers/image2: apply several formatting changes

5 years agodoc/muxers/image2: document strftime option
Ramiro Polla [Wed, 8 Jan 2014 04:49:42 +0000 (02:49 -0200)]
doc/muxers/image2: document strftime option

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
5 years agodoc/muxers/matroska: add information to the matroska metadata language entry
Helmut K. C. Tessarek [Wed, 8 Jan 2014 08:50:57 +0000 (09:50 +0100)]
doc/muxers/matroska: add information to the matroska metadata language entry

5 years agodoc/ffmpeg: remove documentation for removed vlang/slang options
Stefano Sabatini [Wed, 8 Jan 2014 08:47:53 +0000 (09:47 +0100)]
doc/ffmpeg: remove documentation for removed vlang/slang options

5 years agodoc/muxers/matroska: reformat documentation
Stefano Sabatini [Wed, 8 Jan 2014 08:45:04 +0000 (09:45 +0100)]
doc/muxers/matroska: reformat documentation

5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 8 Jan 2014 04:44:51 +0000 (05:44 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  arm: Add a missing # as prefix for an immediate constant

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '5dae4872357613a0b51120b54a4c5221e0ec3f69'
Michael Niedermayer [Wed, 8 Jan 2014 04:36:48 +0000 (05:36 +0100)]
Merge commit '5dae4872357613a0b51120b54a4c5221e0ec3f69'

* commit '5dae4872357613a0b51120b54a4c5221e0ec3f69':
  arm: Allow overriding the alignment set in the function macro

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b7b932f5e3602bd34c3cc634b71c8bbbc0fb8dc0'
Michael Niedermayer [Wed, 8 Jan 2014 04:21:10 +0000 (05:21 +0100)]
Merge commit 'b7b932f5e3602bd34c3cc634b71c8bbbc0fb8dc0'

* commit 'b7b932f5e3602bd34c3cc634b71c8bbbc0fb8dc0':
  arm: Remove a leftover define for the pld instruction

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '67bb3a4e285a5871770cbaa2d78bf9024961dd0f'
Michael Niedermayer [Wed, 8 Jan 2014 04:13:25 +0000 (05:13 +0100)]
Merge commit '67bb3a4e285a5871770cbaa2d78bf9024961dd0f'

* commit '67bb3a4e285a5871770cbaa2d78bf9024961dd0f':
  arm: cosmetics: Reindent the h264dsp neon init function

Conflicts:
libavcodec/arm/h264dsp_init_arm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mxfdec: detect loops during header parsing
Michael Niedermayer [Wed, 8 Jan 2014 03:49:50 +0000 (04:49 +0100)]
avformat/mxfdec: detect loops during header parsing

The header parser uses forward and backward parsing, making the
bulletproof prevention of loops difficult, thus this simple
detection code.
If someone improves the forward/backward parsing so it cannot loop
then this commit should be reverted

Fixes Ticket3278

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agovp9: make mv bounds 32bit.
Ronald S. Bultje [Tue, 7 Jan 2014 12:24:03 +0000 (07:24 -0500)]
vp9: make mv bounds 32bit.

Fixes an assert in file from trac ticket 3188.