ffmpeg.git
5 years agoMerge commit 'bfd26b7ce6efea594f2b99441d900419df3af638'
Michael Niedermayer [Mon, 6 Jan 2014 15:28:55 +0000 (16:28 +0100)]
Merge commit 'bfd26b7ce6efea594f2b99441d900419df3af638'

* commit 'bfd26b7ce6efea594f2b99441d900419df3af638':
  h264: reject mismatching luma/chroma bit depths during sps parsing

Conflicts:
libavcodec/h264_ps.c

See: bdeb61ccc67911cfc5e20c7cfb1312d0501ca90a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/h264: reset list_count too in case of error in ff_set_ref_count()
Michael Niedermayer [Mon, 6 Jan 2014 15:15:40 +0000 (16:15 +0100)]
avcodec/h264: reset list_count too in case of error in ff_set_ref_count()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '9a026c72982faf20e1c8dfbe48f0b312cdea69c8'
Michael Niedermayer [Mon, 6 Jan 2014 15:15:03 +0000 (16:15 +0100)]
Merge commit '9a026c72982faf20e1c8dfbe48f0b312cdea69c8'

* commit '9a026c72982faf20e1c8dfbe48f0b312cdea69c8':
  h264: rebuild the default ref list if the reference count changes

Conflicts:
libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4736d003fac30af4afd8390182f12f480ad78801'
Michael Niedermayer [Mon, 6 Jan 2014 14:51:17 +0000 (15:51 +0100)]
Merge commit '4736d003fac30af4afd8390182f12f480ad78801'

* commit '4736d003fac30af4afd8390182f12f480ad78801':
  cavsdec: check ff_get_buffer() return value

Conflicts:
libavcodec/cavsdec.c

See: eee8c94f50bfcd93c1f761b4e6b55bec3815616d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '50079a6aa93291e6dc9d9fb8d33da83f79e9311d'
Michael Niedermayer [Mon, 6 Jan 2014 14:43:24 +0000 (15:43 +0100)]
Merge commit '50079a6aa93291e6dc9d9fb8d33da83f79e9311d'

* commit '50079a6aa93291e6dc9d9fb8d33da83f79e9311d':
  lavc: do not leak the internal frame if opening the codec fails

Conflicts:
libavcodec/utils.c

See: 8b285f03f70e884312c6c4e00a1377cfd85a3a7a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3867f3718ba82ff11d3e24c6d84beb520d0b174f'
Michael Niedermayer [Mon, 6 Jan 2014 14:34:45 +0000 (15:34 +0100)]
Merge commit '3867f3718ba82ff11d3e24c6d84beb520d0b174f'

* commit '3867f3718ba82ff11d3e24c6d84beb520d0b174f':
  lavf: remove a pointless check

Conflicts:
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '75647dea6f7db79b409bad66a119f5c73da730f3'
Michael Niedermayer [Mon, 6 Jan 2014 14:24:42 +0000 (15:24 +0100)]
Merge commit '75647dea6f7db79b409bad66a119f5c73da730f3'

* commit '75647dea6f7db79b409bad66a119f5c73da730f3':
  oggparseogm: check timing variables

See: 9ed388f5985992a0a6a43fdc0b1732962b6b5619
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '8058284ce09030b47512746d726fb2ad3ae8a20f'
Michael Niedermayer [Mon, 6 Jan 2014 14:17:34 +0000 (15:17 +0100)]
Merge commit '8058284ce09030b47512746d726fb2ad3ae8a20f'

* commit '8058284ce09030b47512746d726fb2ad3ae8a20f':
  lavc: add 422/444 YUV with alpha to align_dimensions()

Conflicts:
libavcodec/utils.c

Only cosmetical changes happen as these formats already where in the list before

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '2f97094608cfd2665660f7a26a3291559b186752'
Michael Niedermayer [Mon, 6 Jan 2014 13:57:41 +0000 (14:57 +0100)]
Merge commit '2f97094608cfd2665660f7a26a3291559b186752'

* commit '2f97094608cfd2665660f7a26a3291559b186752':
  lagarith: do not call simd functions on unaligned lines

Conflicts:
libavcodec/lagarith.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'f4a8a0080537484154bb74e08ec76cbcbd25484b'
Michael Niedermayer [Mon, 6 Jan 2014 13:40:26 +0000 (14:40 +0100)]
Merge commit 'f4a8a0080537484154bb74e08ec76cbcbd25484b'

* commit 'f4a8a0080537484154bb74e08ec76cbcbd25484b':
  sgidec: fix buffer size check in expand_rle_row()

Conflicts:
libavcodec/sgidec.c

See: 39c56ef9216c508a2c19cef93600e6590b4595cd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'adb199d1bc7f86aa6b85986f40190ec17f99d34f'
Michael Niedermayer [Mon, 6 Jan 2014 12:57:29 +0000 (13:57 +0100)]
Merge commit 'adb199d1bc7f86aa6b85986f40190ec17f99d34f'

* commit 'adb199d1bc7f86aa6b85986f40190ec17f99d34f':
  kgv1dec: replace forcing EMU_EDGE by a copy

Conflicts:
libavcodec/kgv1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'fe80fa53bc4977ef6e8e749a9df8ca5590a09307'
Michael Niedermayer [Mon, 6 Jan 2014 12:48:46 +0000 (13:48 +0100)]
Merge commit 'fe80fa53bc4977ef6e8e749a9df8ca5590a09307'

* commit 'fe80fa53bc4977ef6e8e749a9df8ca5590a09307':
  4xm: replace forcing EMU_EDGE by a copy

Conflicts:
libavcodec/4xm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'fffca3d278c2a2422c2f61f21c5a9d5f690d328e'
Michael Niedermayer [Mon, 6 Jan 2014 12:30:40 +0000 (13:30 +0100)]
Merge commit 'fffca3d278c2a2422c2f61f21c5a9d5f690d328e'

* commit 'fffca3d278c2a2422c2f61f21c5a9d5f690d328e':
  4xm: return a proper error code.

Conflicts:
libavcodec/4xm.c

See: a5e382ad7ffd8be810f3a614c4c447a1cd1936f2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '060667195e6e6bc0fa63ce13c47e23aabe70d122'
Michael Niedermayer [Mon, 6 Jan 2014 12:24:37 +0000 (13:24 +0100)]
Merge commit '060667195e6e6bc0fa63ce13c47e23aabe70d122'

* commit '060667195e6e6bc0fa63ce13c47e23aabe70d122':
  hevc: rename some HEVC conformance streams

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '98c0cd0b99254cd12f312bf6a4c24cd3ec5886b5'
Michael Niedermayer [Mon, 6 Jan 2014 12:01:02 +0000 (13:01 +0100)]
Merge commit '98c0cd0b99254cd12f312bf6a4c24cd3ec5886b5'

* commit '98c0cd0b99254cd12f312bf6a4c24cd3ec5886b5':
  hevc: add new conformance streams

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoh264: reject mismatching luma/chroma bit depths during sps parsing
Anton Khirnov [Thu, 28 Nov 2013 09:54:35 +0000 (10:54 +0100)]
h264: reject mismatching luma/chroma bit depths during sps parsing

There is no point in delaying the check and it avoids bugs with a
half-initialized context.

Fixes invalid reads.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

5 years agoh264: rebuild the default ref list if the reference count changes
Anton Khirnov [Thu, 28 Nov 2013 09:54:35 +0000 (10:54 +0100)]
h264: rebuild the default ref list if the reference count changes

Fixes possible access to freed memory.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

5 years agocavsdec: check ff_get_buffer() return value
Anton Khirnov [Thu, 28 Nov 2013 09:54:35 +0000 (10:54 +0100)]
cavsdec: check ff_get_buffer() return value

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

5 years agolavc: do not leak the internal frame if opening the codec fails
Anton Khirnov [Mon, 16 Dec 2013 21:54:43 +0000 (22:54 +0100)]
lavc: do not leak the internal frame if opening the codec fails

5 years agolavf: remove a pointless check
Anton Khirnov [Mon, 16 Dec 2013 21:37:40 +0000 (22:37 +0100)]
lavf: remove a pointless check

AVStream.codec is always non-NULL

5 years agooggparseogm: check timing variables
Anton Khirnov [Thu, 28 Nov 2013 09:54:35 +0000 (10:54 +0100)]
oggparseogm: check timing variables

Fixes a potential divide by zero.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

5 years agolavc: add 422/444 YUV with alpha to align_dimensions()
Anton Khirnov [Fri, 3 Jan 2014 13:50:49 +0000 (14:50 +0100)]
lavc: add 422/444 YUV with alpha to align_dimensions()

Aligns frame dimensions to 16, which fixes potential invalid writes.

5 years agolagarith: do not call simd functions on unaligned lines
Kostya Shishkov [Mon, 30 Dec 2013 08:31:57 +0000 (09:31 +0100)]
lagarith: do not call simd functions on unaligned lines

They end up overwriting past the line end.

Partially based on a patch by Michael Niedermayer <michaelni@gmx.at>

Bug-Id: vlc/9700
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agosgidec: fix buffer size check in expand_rle_row()
Anton Khirnov [Thu, 2 Jan 2014 08:34:20 +0000 (09:34 +0100)]
sgidec: fix buffer size check in expand_rle_row()

Right now it will spuriously fail if the linesize is exactly equal to
the data width.

CC:libav-stable@libav.org

5 years agokgv1dec: replace forcing EMU_EDGE by a copy
Anton Khirnov [Tue, 17 Dec 2013 07:56:13 +0000 (08:56 +0100)]
kgv1dec: replace forcing EMU_EDGE by a copy

The decoder currently sets CODEC_FLAG_EMU_EDGE and relies on
get_buffer2() to always provide buffers with linesize == 2 * width.
This is wrong, since we place no such restriction on get_buffer2()
implementations.

Fix this by decoding into internal buffers and copying them to output
frames. Since this is a very obscure decoder, the performance hit should
not be an issue.

5 years ago4xm: replace forcing EMU_EDGE by a copy
Anton Khirnov [Tue, 17 Dec 2013 07:56:13 +0000 (08:56 +0100)]
4xm: replace forcing EMU_EDGE by a copy

The decoder currently sets CODEC_FLAG_EMU_EDGE and relies on
get_buffer2() to always provide buffers with linesize == 2 * width.
This is wrong, since we place no such restriction on get_buffer2()
implementations.

Fix this by decoding into internal buffers and copying them to output
frames. Since this is a very obscure decoder, the performance hit should
not be an issue.

5 years ago4xm: return a proper error code.
Anton Khirnov [Tue, 17 Dec 2013 07:33:55 +0000 (08:33 +0100)]
4xm: return a proper error code.

5 years agohevc: rename some HEVC conformance streams
Guillaume Martres [Tue, 31 Dec 2013 13:29:04 +0000 (14:29 +0100)]
hevc: rename some HEVC conformance streams

Some HEVC conformance streams zip on
http://wftp3.itu.int/av-arch/jctvc-site/bitstream_exchange/draft_conformance/
were updated without changing the actual stream. Rename them in FATE
accordingly to make it easier to track future stream updates.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agohevc: add new conformance streams
Guillaume Martres [Tue, 31 Dec 2013 13:29:03 +0000 (14:29 +0100)]
hevc: add new conformance streams

Also remove superseded conformance streams. The conformance streams all
come from http://wftp3.itu.int/av-arch/jctvc-site/bitstream_exchange/draft_conformance/

Signed-off-by: Anton Khirnov <anton@khirnov.net>
5 years agoavcodec/hevc: Fix modulo operations
Michael Niedermayer [Mon, 6 Jan 2014 01:51:20 +0000 (02:51 +0100)]
avcodec/hevc: Fix modulo operations

Fixes qp fields becoming out of range
Fixes: asan_static-oob_e393a3_6998_WPP_A_ericsson_MAIN10_2.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/hevc_ps: check that VPS referenced from SPS exists
Michael Niedermayer [Mon, 6 Jan 2014 01:51:20 +0000 (02:51 +0100)]
avcodec/hevc_ps: check that VPS referenced from SPS exists

This matches how its done for SPS/PPS.
An alternative to this is to check it when its used.

Fixes null pointer dereference
Fixes: signal_sigsegv_e30a43_1437_CIP_A_Panasonic_3.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/huffyuvdec: optimize decode_plane_bitstream(), use joint tables for new yuv...
Michael Niedermayer [Wed, 1 Jan 2014 00:47:10 +0000 (01:47 +0100)]
avcodec/huffyuvdec: optimize decode_plane_bitstream(), use joint tables for new yuv formats

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agofate: test version 3 of ffvhuff
Michael Niedermayer [Mon, 6 Jan 2014 00:37:22 +0000 (01:37 +0100)]
fate: test version 3 of ffvhuff

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/huffyuv: Support more 8bit YUV formats
Michael Niedermayer [Wed, 1 Jan 2014 00:42:59 +0000 (01:42 +0100)]
avcodec/huffyuv: Support more 8bit YUV formats

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 5 Jan 2014 22:23:53 +0000 (23:23 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  cmdutils: update copyright year to 2014.

Conflicts:
cmdutils.c

See: 0b1cfc4f28d81a8a49fdd5589b2eed06477abd61
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7840c40445c9f52aeccba96de3d27613398bfbf2'
Michael Niedermayer [Sun, 5 Jan 2014 22:14:20 +0000 (23:14 +0100)]
Merge commit '7840c40445c9f52aeccba96de3d27613398bfbf2'

* commit '7840c40445c9f52aeccba96de3d27613398bfbf2':
  (e)ac3dec: set AV_FRAME_DATA_MATRIXENCODING side data.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '13345fc1f86fc3615789e196d5a339c1c27c9068'
Michael Niedermayer [Sun, 5 Jan 2014 22:06:45 +0000 (23:06 +0100)]
Merge commit '13345fc1f86fc3615789e196d5a339c1c27c9068'

* commit '13345fc1f86fc3615789e196d5a339c1c27c9068':
  (e)ac3: parse and store the Dolby Surround, Surround EX and Headphone mode flags.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e92123093dfdca0ef6608998240e2f9345d63bff'
Michael Niedermayer [Sun, 5 Jan 2014 21:58:49 +0000 (22:58 +0100)]
Merge commit 'e92123093dfdca0ef6608998240e2f9345d63bff'

* commit 'e92123093dfdca0ef6608998240e2f9345d63bff':
  mlpdec: set AV_FRAME_DATA_MATRIXENCODING side data.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4b7f1a7ced0e98f2cc698d896f7ebab8d30eaa09'
Michael Niedermayer [Sun, 5 Jan 2014 21:53:13 +0000 (22:53 +0100)]
Merge commit '4b7f1a7ced0e98f2cc698d896f7ebab8d30eaa09'

* commit '4b7f1a7ced0e98f2cc698d896f7ebab8d30eaa09':
  mlp: Parse TrueHD decoder channel modifiers and set the AVMatrixEncoding for each substream.

Conflicts:
libavcodec/mlp_parser.h
libavcodec/mlpdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '30d70e79a6b4ac7f4eb66446a9da275161ef6ea7'
Michael Niedermayer [Sun, 5 Jan 2014 21:34:15 +0000 (22:34 +0100)]
Merge commit '30d70e79a6b4ac7f4eb66446a9da275161ef6ea7'

* commit '30d70e79a6b4ac7f4eb66446a9da275161ef6ea7':
  dcadec: set AV_FRAME_DATA_MATRIXENCODING side data.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '6bfdb2de881372048be7fbda643417e1fd3ce93c'
Michael Niedermayer [Sun, 5 Jan 2014 21:27:34 +0000 (22:27 +0100)]
Merge commit '6bfdb2de881372048be7fbda643417e1fd3ce93c'

* commit '6bfdb2de881372048be7fbda643417e1fd3ce93c':
  dcadec: set the output channel mode more accurately.

Conflicts:
libavcodec/dcadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '5b4797a21db900b7d509660b7a4d49829089b004'
Michael Niedermayer [Sun, 5 Jan 2014 21:12:41 +0000 (22:12 +0100)]
Merge commit '5b4797a21db900b7d509660b7a4d49829089b004'

* commit '5b4797a21db900b7d509660b7a4d49829089b004':
  avframe: add AV_FRAME_DATA_MATRIXENCODING side data type.

Conflicts:
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '5c437fb'
Michael Niedermayer [Sun, 5 Jan 2014 20:55:58 +0000 (21:55 +0100)]
Merge commit '5c437fb'

* commit '5c437fb':
  lavu: Add values for various Dolby flags to the AVMatrixEncoding enum.

Conflicts:
doc/APIchanges
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agovp9_parse: don't use AVCodecParserContext as av_log context.
Ronald S. Bultje [Sun, 5 Jan 2014 18:32:03 +0000 (13:32 -0500)]
vp9_parse: don't use AVCodecParserContext as av_log context.

Fixes trac ticket 3273.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agocmdutils: update copyright year to 2014.
Johan Andersson [Sat, 4 Jan 2014 19:47:32 +0000 (20:47 +0100)]
cmdutils: update copyright year to 2014.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoavfilter/vf_format: check that the format list is not empty
Michael Niedermayer [Sun, 5 Jan 2014 19:14:03 +0000 (20:14 +0100)]
avfilter/vf_format: check that the format list is not empty

Fixes Ticket3210

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agopulse: get latency only when needed
Federico Simoncelli [Sun, 5 Jan 2014 12:04:46 +0000 (13:04 +0100)]
pulse: get latency only when needed

Signed-off-by: Federico Simoncelli <fsimonce@redhat.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agopulse: set time_base as multiple of sample_rate
Federico Simoncelli [Sun, 5 Jan 2014 12:03:14 +0000 (13:03 +0100)]
pulse: set time_base as multiple of sample_rate

The stream time_base has been changed to be a multiple of the
device sample_rate. Now the frame_duration computation is simpler
and a message will warn about problematic frame_size values.

Signed-off-by: Federico Simoncelli <fsimonce@redhat.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/nutdec: remove unused variable
Michael Niedermayer [Sun, 5 Jan 2014 16:27:23 +0000 (17:27 +0100)]
avformat/nutdec: remove unused variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years ago(e)ac3dec: set AV_FRAME_DATA_MATRIXENCODING side data.
Tim Walker [Wed, 11 Dec 2013 02:03:35 +0000 (02:03 +0000)]
(e)ac3dec: set AV_FRAME_DATA_MATRIXENCODING side data.

5 years ago(e)ac3: parse and store the Dolby Surround, Surround EX and Headphone mode flags.
Tim Walker [Wed, 11 Dec 2013 02:03:34 +0000 (02:03 +0000)]
(e)ac3: parse and store the Dolby Surround, Surround EX and Headphone mode flags.

5 years agomlpdec: set AV_FRAME_DATA_MATRIXENCODING side data.
Tim Walker [Wed, 11 Dec 2013 02:03:33 +0000 (02:03 +0000)]
mlpdec: set AV_FRAME_DATA_MATRIXENCODING side data.

5 years agomlp: Parse TrueHD decoder channel modifiers and set the AVMatrixEncoding for each...
Tim Walker [Wed, 11 Dec 2013 02:03:32 +0000 (02:03 +0000)]
mlp: Parse TrueHD decoder channel modifiers and set the AVMatrixEncoding for each substream.

5 years agodcadec: set AV_FRAME_DATA_MATRIXENCODING side data.
Tim Walker [Wed, 11 Dec 2013 02:03:31 +0000 (02:03 +0000)]
dcadec: set AV_FRAME_DATA_MATRIXENCODING side data.

5 years agodcadec: set the output channel mode more accurately.
Tim Walker [Wed, 11 Dec 2013 02:03:30 +0000 (02:03 +0000)]
dcadec: set the output channel mode more accurately.

When downmixing 2.1 to 2-channel, if the 2.0 portion is Lt/Rt, sum-difference or dual mono, the actual output will be the same (with the LFE either mixed-in or discarded).

Also, when downmixing an arbitrary layout to 2-channel, if the bitstream contains custom downmix coefficients targeting Lt/Rt, then the output will be Lt/Rt rather than regular Stereo.

5 years agoavframe: add AV_FRAME_DATA_MATRIXENCODING side data type.
Tim Walker [Wed, 11 Dec 2013 02:03:29 +0000 (02:03 +0000)]
avframe: add AV_FRAME_DATA_MATRIXENCODING side data type.

Includes a libavcodec utility function to update a frame's side data.

5 years agolavu: Add values for various Dolby flags to the AVMatrixEncoding enum.
Tim Walker [Wed, 11 Dec 2013 02:03:28 +0000 (02:03 +0000)]
lavu: Add values for various Dolby flags to the AVMatrixEncoding enum.

5 years agov4l2: setting device parameters early
Federico Simoncelli [Thu, 2 Jan 2014 15:25:48 +0000 (16:25 +0100)]
v4l2: setting device parameters early

Setting the v4l2 device parameters may influence video properties
such as width, height and pixel format.
This patch moves v4l2_set_parameters to be executed before fetching
the video properties, avoiding errors such as (pal vs ntsc):

 The v4l2 frame is 829440 bytes, but 691200 bytes are expected

Signed-off-by: Federico Simoncelli <fsimonce@redhat.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 5 Jan 2014 12:29:34 +0000 (13:29 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Support preprocessor macros as header names

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: Support preprocessor macros as header names
Diego Biurrun [Mon, 23 Dec 2013 00:03:48 +0000 (01:03 +0100)]
configure: Support preprocessor macros as header names

New versions of FreeType have moved the location of their API
header(s) and hide the location behind a macro.

Since the location changes between versions and no other way
to know the location exists, this workaround becomes necessary.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agoavformat/matroskaenc: warn when muxing video codec not supported by format
Peter Ross [Sun, 5 Jan 2014 01:04:29 +0000 (12:04 +1100)]
avformat/matroskaenc: warn when muxing video codec not supported by format

This occurs for video codecs that have codec_tag set, but are are not listed
in ff_codec_bmp_tags (e.g. AV_CODEC_ID_BINKAUDIO, AV_CODEC_ID_IFF_ILBM).

Fixes ticket #3269.

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 5 Jan 2014 01:37:42 +0000 (02:37 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  sdp: Check that fmt->oformat is non-null before accessing it

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '9d18a7d3ec09d6d933d648570643fde924aa391a'
Michael Niedermayer [Sun, 5 Jan 2014 01:25:03 +0000 (02:25 +0100)]
Merge commit '9d18a7d3ec09d6d933d648570643fde924aa391a'

* commit '9d18a7d3ec09d6d933d648570643fde924aa391a':
  fate: Update AAC ELD 5.1 ref for recent bugfixes.

also reenable fate-aac-er_ad6000np_44_ep0, as this commit updates the pcm
reference, so that the test works again

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7f29644108c5fbd80f160930b31b78b8704c1a49'
Michael Niedermayer [Sun, 5 Jan 2014 01:18:51 +0000 (02:18 +0100)]
Merge commit '7f29644108c5fbd80f160930b31b78b8704c1a49'

* commit '7f29644108c5fbd80f160930b31b78b8704c1a49':
  aac: Fix low delay windowing.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '42d1b41983971da63302ac3d12091cad1f3d6324'
Michael Niedermayer [Sun, 5 Jan 2014 01:09:49 +0000 (02:09 +0100)]
Merge commit '42d1b41983971da63302ac3d12091cad1f3d6324'

* commit '42d1b41983971da63302ac3d12091cad1f3d6324':
  fate: Add a test vector for AAC ELD with TNS.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b2212dec0f011893ec68eecaa990170fa24050d7'
Michael Niedermayer [Sun, 5 Jan 2014 00:48:29 +0000 (01:48 +0100)]
Merge commit 'b2212dec0f011893ec68eecaa990170fa24050d7'

* commit 'b2212dec0f011893ec68eecaa990170fa24050d7':
  aac: Fix TNS decoding for the 512 sample window family.

also temporarily disable fate-aac-er_ad6000np_44_ep0 as this commit
causes a mismatch with the reference pcm file
The test will be reenabled after all fixes and with a new pcm reference

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e2096e2eaa9e75663d6bf0c37d342752aa5a146d'
Michael Niedermayer [Sun, 5 Jan 2014 00:13:06 +0000 (01:13 +0100)]
Merge commit 'e2096e2eaa9e75663d6bf0c37d342752aa5a146d'

* commit 'e2096e2eaa9e75663d6bf0c37d342752aa5a146d':
  fate: Add a downsampled SBR testvector

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mp3dec: fix start time in light of initial skip samples
Michael Niedermayer [Sat, 4 Jan 2014 23:50:26 +0000 (00:50 +0100)]
avformat/mp3dec: fix start time in light of initial skip samples

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavf/file: fix help message first character casing for trunc option
Stefano Sabatini [Sat, 4 Jan 2014 23:50:22 +0000 (00:50 +0100)]
lavf/file: fix help message first character casing for trunc option

5 years agodoc/protocols/file: fix semantical reverse
Stefano Sabatini [Sat, 4 Jan 2014 23:41:20 +0000 (00:41 +0100)]
doc/protocols/file: fix semantical reverse

Change "read" to "write" in introductory description.

Spotted-by: Alexander Strasser <eclipse7@gmx.net>
5 years agodoc/protocols/file: document general file protocol URL syntax
Stefano Sabatini [Sat, 4 Jan 2014 13:48:23 +0000 (14:48 +0100)]
doc/protocols/file: document general file protocol URL syntax

Also drop confusing ff* tools reference about exceptions to the
file:FILENAME syntax, which is not ff* tool specific.

With various edits by Alexander Strasser <eclipse7@gmx.net>.

5 years agosdp: Check that fmt->oformat is non-null before accessing it
Martin Storsjö [Fri, 3 Jan 2014 13:47:02 +0000 (15:47 +0200)]
sdp: Check that fmt->oformat is non-null before accessing it

This avoids crashes when avserver tries to create an SDP, since
d77f4af.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agofate: Update AAC ELD 5.1 ref for recent bugfixes.
Alex Converse [Tue, 24 Dec 2013 06:21:08 +0000 (22:21 -0800)]
fate: Update AAC ELD 5.1 ref for recent bugfixes.

5 years agoaac: Fix low delay windowing.
Alex Converse [Tue, 24 Dec 2013 21:03:26 +0000 (13:03 -0800)]
aac: Fix low delay windowing.

AAC LD uses a low overlap sine window instead of a KBD window.

5 years agofate: Add a test vector for AAC ELD with TNS.
Alex Converse [Tue, 24 Dec 2013 06:35:48 +0000 (22:35 -0800)]
fate: Add a test vector for AAC ELD with TNS.

5 years agoaac: Fix TNS decoding for the 512 sample window family.
Alex Converse [Tue, 24 Dec 2013 06:20:42 +0000 (22:20 -0800)]
aac: Fix TNS decoding for the 512 sample window family.

5 years agofate: Add a downsampled SBR testvector
Alex Converse [Mon, 23 Dec 2013 20:07:45 +0000 (12:07 -0800)]
fate: Add a downsampled SBR testvector

5 years agolavf/file: file_check: Handle file URLs that start with "file:"
Alexander Strasser [Thu, 2 Jan 2014 18:00:15 +0000 (19:00 +0100)]
lavf/file: file_check: Handle file URLs that start with "file:"

Handle the URL analog to file_open, it may contain a "file:"
prefix. Skip it. Make access checks to file URLs starting
with "file:" work.

Fix part of ticket #3249.

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
5 years agoavformat/oggparseopus: fix segmented timestamps
Mark Harris [Tue, 31 Dec 2013 19:04:54 +0000 (11:04 -0800)]
avformat/oggparseopus: fix segmented timestamps

Fix timestamp calculation for code 3 Ogg Opus packets with less than
2 bytes in the last segment (e.g. packet length 255 or 256).
A sample that would seek incorrectly in ffplay can be created with:
  ffmpeg -i in.wav -b:a 34k -vbr off -frame_duration 60 out.opus
and libopus 1.1

Also do not read past the end of the buffer when a packet has length 0.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/oggdec: dont read timestamps from EOS pages of ogm videos
Michael Niedermayer [Sat, 4 Jan 2014 16:33:59 +0000 (17:33 +0100)]
avformat/oggdec: dont read timestamps from EOS pages of ogm videos

Some muxers store invalid timestamps there, which breaks seeking
Fixes Ticket2739

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/utils: fix rounding error accumulation for generated dts in compute_pkt_fields()
Michael Niedermayer [Fri, 3 Jan 2014 16:44:15 +0000 (17:44 +0100)]
avformat/utils: fix rounding error accumulation for generated dts in compute_pkt_fields()

This only updates the case where there is no B frame reordering delay.

Tested-by: Anssi Hannula <anssi.hannula@iki.fi>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/rational: av_add_stable() test code
Michael Niedermayer [Fri, 3 Jan 2014 16:35:09 +0000 (17:35 +0100)]
avutil/rational: av_add_stable() test code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/mathematics: add av_add_stable()
Michael Niedermayer [Fri, 3 Jan 2014 16:30:50 +0000 (17:30 +0100)]
avutil/mathematics: add av_add_stable()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoChangelog: add nuts side & metadata support
Michael Niedermayer [Sat, 4 Jan 2014 14:07:52 +0000 (15:07 +0100)]
Changelog: add nuts side & metadata support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/nut: add support for per frame side & meta data with version 4
Michael Niedermayer [Mon, 23 Dec 2013 01:58:36 +0000 (02:58 +0100)]
avformat/nut: add support for per frame side & meta data with version 4

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

* qatar/master:
  arm: Use the matching endfunc macro instead of the assembler directive directly

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '2ad4ee345a4216aef3999f57dd14c56128d27a13'
Michael Niedermayer [Sat, 4 Jan 2014 12:13:07 +0000 (13:13 +0100)]
Merge commit '2ad4ee345a4216aef3999f57dd14c56128d27a13'

* commit '2ad4ee345a4216aef3999f57dd14c56128d27a13':
  arm: Add a missing endfunc macro call

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoarm: Use the matching endfunc macro instead of the assembler directive directly
Martin Storsjö [Fri, 3 Jan 2014 09:39:10 +0000 (11:39 +0200)]
arm: Use the matching endfunc macro instead of the assembler directive directly

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoarm: Add a missing endfunc macro call
Martin Storsjö [Fri, 3 Jan 2014 09:36:08 +0000 (11:36 +0200)]
arm: Add a missing endfunc macro call

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoavfilter/lut3d: fix channel order in Iridas format parsing.
Clément Bœsch [Sat, 4 Jan 2014 08:31:40 +0000 (09:31 +0100)]
avfilter/lut3d: fix channel order in Iridas format parsing.

According to http://doc.iridas.com/index.php?title=LUT_Formats

    for 3D textures, the data is also RGB, and ordered in such a way
    that the red coordinate changes fastest, then the green coordinate,
    and finally, the blue coordinate changes slowest:

Fixes Ticket #3236.

5 years agoavcodec/rv30: put the rpr check back in init with the max vs bits bug fixed
Michael Niedermayer [Sat, 4 Jan 2014 03:18:43 +0000 (04:18 +0100)]
avcodec/rv30: put the rpr check back in init with the max vs bits bug fixed

Its usefull to know immediatly if extradata is wrong and not just when later
the decoder tries to use it.

This check was removed by: a6a2282c25abe43e352010a7c3fbc92994c0bc1c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/rv30: check rpr before use against maximum
Michael Niedermayer [Sat, 4 Jan 2014 03:17:15 +0000 (04:17 +0100)]
avcodec/rv30: check rpr before use against maximum

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/rv30: cleanup rpr handling
Michael Niedermayer [Sat, 4 Jan 2014 03:16:46 +0000 (04:16 +0100)]
avcodec/rv30: cleanup rpr handling

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/rv10: cleanup rpr handling
Michael Niedermayer [Sat, 4 Jan 2014 03:15:22 +0000 (04:15 +0100)]
avcodec/rv10: cleanup rpr handling

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

* qatar/master:
  mpegvideo: remove disabled bfin asm

Conflicts:
libavcodec/bfin/mpegvideo_bfin.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a4d0c6e0503562d4cc8f9f6d02d84d7b32583b15'
Michael Niedermayer [Sat, 4 Jan 2014 02:03:02 +0000 (03:03 +0100)]
Merge commit 'a4d0c6e0503562d4cc8f9f6d02d84d7b32583b15'

* commit 'a4d0c6e0503562d4cc8f9f6d02d84d7b32583b15':
  mpegvideo: move dct_unquantize functions up to avoid forward declarations

Conflicts:
libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'aec25b1c4650944d32706bfd40eb02bbd5587303'
Michael Niedermayer [Sat, 4 Jan 2014 01:56:29 +0000 (02:56 +0100)]
Merge commit 'aec25b1c4650944d32706bfd40eb02bbd5587303'

* commit 'aec25b1c4650944d32706bfd40eb02bbd5587303':
  mpegvideo: split the encoding-only parts of frame_start() into a separate function

Conflicts:
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c

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

* commit 'b318106fae65149356934fc72feafef3272fd4ea':
  FATE: add a test for the lavr mixing case fixed in fc6a3ef40d34ce8443ae57c2452f3f273d7d4891

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a8cc88b1a23dc1515f27cfa98af16a273c539091'
Michael Niedermayer [Sat, 4 Jan 2014 01:34:55 +0000 (02:34 +0100)]
Merge commit 'a8cc88b1a23dc1515f27cfa98af16a273c539091'

* commit 'a8cc88b1a23dc1515f27cfa98af16a273c539091':
  tests/Makefile: allow FILTER* to be called with lists of filter names

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'cc976a75dffa148d655b52604331679ff669e8a2'
Michael Niedermayer [Sat, 4 Jan 2014 01:29:38 +0000 (02:29 +0100)]
Merge commit 'cc976a75dffa148d655b52604331679ff669e8a2'

* commit 'cc976a75dffa148d655b52604331679ff669e8a2':
  audio_mix: print (SKIP) instead of 0.0 for matrix columns removed along with output zeroing

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