ffmpeg.git
4 years agoavcodec/vorbis: fix decoding of single element huffman trees
Michael Niedermayer [Sat, 8 Mar 2014 04:13:05 +0000 (05:13 +0100)]
avcodec/vorbis: fix decoding of single element huffman trees

Fixes Ticket2893

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/vorbis: return proper error codes from ff_vorbis_len2vlc()
Michael Niedermayer [Sat, 8 Mar 2014 03:59:56 +0000 (04:59 +0100)]
avcodec/vorbis: return proper error codes from ff_vorbis_len2vlc()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/wmadec: initialize max_exponent to valid values
Michael Niedermayer [Sat, 8 Mar 2014 00:31:42 +0000 (01:31 +0100)]
avcodec/wmadec: initialize max_exponent to valid values

Fixes generation of NaN output
Fixes: nan_example.wma
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 7 Mar 2014 23:20:56 +0000 (00:20 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fic: Properly handle skip frames

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'f69befe5eefef12172a6479dd9cef3c01bddec7a'
Michael Niedermayer [Fri, 7 Mar 2014 23:13:20 +0000 (00:13 +0100)]
Merge commit 'f69befe5eefef12172a6479dd9cef3c01bddec7a'

* commit 'f69befe5eefef12172a6479dd9cef3c01bddec7a':
  matroskadec: cosmetics: Fix "attachement" vs. "attachment" typo

Conflicts:
libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '84cfce9f99805a144df684417e166c1ae6f95421'
Michael Niedermayer [Fri, 7 Mar 2014 22:46:37 +0000 (23:46 +0100)]
Merge commit '84cfce9f99805a144df684417e166c1ae6f95421'

* commit '84cfce9f99805a144df684417e166c1ae6f95421':
  matroskadec: K&R formatting cosmetics

Conflicts:
libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc: fix typo
compn [Fri, 7 Mar 2014 22:07:37 +0000 (17:07 -0500)]
doc: fix typo

4 years agodxva2_vc1: include the start code in wMBbitOffset
Hendrik Leppkes [Fri, 7 Mar 2014 13:02:59 +0000 (14:02 +0100)]
dxva2_vc1: include the start code in wMBbitOffset

This resolves a decoding failure on Intel GPUs.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodxva2_vc1: fix intensity compensation condition with interlaced fields
Hendrik Leppkes [Fri, 7 Mar 2014 13:02:58 +0000 (14:02 +0100)]
dxva2_vc1: fix intensity compensation condition with interlaced fields

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agofic: Properly handle skip frames
Derek Buitenhuis [Fri, 7 Mar 2014 14:31:53 +0000 (14:31 +0000)]
fic: Properly handle skip frames

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 7 Mar 2014 13:09:31 +0000 (14:09 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtmppkt: Rename the ts_delta field to ts_field

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agomatroskadec: cosmetics: Fix "attachement" vs. "attachment" typo
Diego Biurrun [Fri, 7 Mar 2014 12:54:18 +0000 (13:54 +0100)]
matroskadec: cosmetics: Fix "attachement" vs. "attachment" typo

4 years agoMerge commit '8bbb02ae4f44f1cddc1ce1e74a71fa2022e93da3'
Michael Niedermayer [Fri, 7 Mar 2014 12:41:08 +0000 (13:41 +0100)]
Merge commit '8bbb02ae4f44f1cddc1ce1e74a71fa2022e93da3'

* commit '8bbb02ae4f44f1cddc1ce1e74a71fa2022e93da3':
  rtmppkt: Properly handle extended timestamps when writing

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agomatroskadec: K&R formatting cosmetics
Keiji Costantini [Sat, 1 Mar 2014 16:28:15 +0000 (17:28 +0100)]
matroskadec: K&R formatting cosmetics

Also sort #includes into canonical order.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
4 years agoMerge commit '48cfb5f4114048383a4ee85b2f500eefce24cad2'
Michael Niedermayer [Fri, 7 Mar 2014 11:58:39 +0000 (12:58 +0100)]
Merge commit '48cfb5f4114048383a4ee85b2f500eefce24cad2'

* commit '48cfb5f4114048383a4ee85b2f500eefce24cad2':
  rtmppkt: Add a descriptive comment

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '5b2ad78f97d43299adcb038c04346999fe9b196c'
Michael Niedermayer [Fri, 7 Mar 2014 11:52:59 +0000 (12:52 +0100)]
Merge commit '5b2ad78f97d43299adcb038c04346999fe9b196c'

* commit '5b2ad78f97d43299adcb038c04346999fe9b196c':
  rtmppkt: Handle extended timestamp field even for one-byte header

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '93d216d37a3f95190ecb9d51cf72f54ea4e04ec7'
Michael Niedermayer [Fri, 7 Mar 2014 11:44:09 +0000 (12:44 +0100)]
Merge commit '93d216d37a3f95190ecb9d51cf72f54ea4e04ec7'

* commit '93d216d37a3f95190ecb9d51cf72f54ea4e04ec7':
  dict: K&R formatting cosmetics

Conflicts:
libavutil/dict.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agortmppkt: Rename the ts_delta field to ts_field
Martin Storsjö [Wed, 5 Mar 2014 14:07:37 +0000 (16:07 +0200)]
rtmppkt: Rename the ts_delta field to ts_field

Based on a suggestion by Martin Panter. This is more descriptive,
since it's the actual timestamp field from the RTMP packet,
which might or might not be a delta depending on context (in
some packets it's a delta, in some packets it's an absolute
timestamp, and in some packets it's 0xffffff to indicate that
the actual delta or absolute timestamp is transmitted separately).

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortmppkt: Properly handle extended timestamps when writing
Martin Panter [Wed, 5 Mar 2014 14:02:18 +0000 (16:02 +0200)]
rtmppkt: Properly handle extended timestamps when writing

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortmppkt: Add a descriptive comment
Martin Panter [Wed, 5 Mar 2014 14:00:44 +0000 (16:00 +0200)]
rtmppkt: Add a descriptive comment

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agortmppkt: Handle extended timestamp field even for one-byte header
Martin Panter [Wed, 5 Mar 2014 04:04:39 +0000 (04:04 +0000)]
rtmppkt: Handle extended timestamp field even for one-byte header

Related fix in "rtmpdump":
https://repo.or.cz/w/rtmpdump.git/commitdiff/79459a2

Adobe's RTMP specification (21 Dec 2012), section 5.3.1.3 ("Extended
Timestamp"), says "this field is present in Type 3 chunks". Type 3 chunks are
those with the one-byte header size.

This resolves intermittent hangs and segfaults caused by the read function,
and also includes an untested fix for the write function.

The read function was tested with ABC (Australia) News 24 streams, however
they are probably restricted to only Australian internet addresses. Some of
the packets at the start of these streams seem to contain junk timestamp
fields, often requiring the extended field. Test command:

avplay rtmp://cp81899.live.edgefcs.net/live/news24-med@28772

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agodict: K&R formatting cosmetics
Patrice Clement [Thu, 6 Mar 2014 18:40:56 +0000 (19:40 +0100)]
dict: K&R formatting cosmetics

4 years agodoc/APIchanges: update versions & hashes
Michael Niedermayer [Wed, 5 Mar 2014 20:10:42 +0000 (21:10 +0100)]
doc/APIchanges: update versions & hashes

4 years agodxva2_h264: add a workaround for old intel GPUs
Hendrik Leppkes [Tue, 4 Mar 2014 07:28:39 +0000 (08:28 +0100)]
dxva2_h264: add a workaround for old intel GPUs

Old Intel GPUs expect the reference frame index to the actual surface,
instead of the index into RefFrameList as specified by the spec.

This workaround should be set when using one of the "ClearVideo" decoder
devices.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodxva2_h264: set the correct ref frame index in the long slice struct
Hendrik Leppkes [Tue, 4 Mar 2014 07:28:38 +0000 (08:28 +0100)]
dxva2_h264: set the correct ref frame index in the long slice struct

The latest H.264 DXVA specification states that the index in this
structure should refer to a valid entry in the RefFrameList of the picture
parameter structure, and not to the actual surface index.

Fixes H.264 DXVA2 decoding on recent Intel GPUs (tested on Sandy and Ivy)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 6 Mar 2014 23:15:15 +0000 (00:15 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libx265: Support API version 9

See: 69ead9af7519796eebbc452fbbdb43af8d846173
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'b66382101cff33e2ce66500327a90d0a105eedeb'
Michael Niedermayer [Thu, 6 Mar 2014 23:03:40 +0000 (00:03 +0100)]
Merge commit 'b66382101cff33e2ce66500327a90d0a105eedeb'

* commit 'b66382101cff33e2ce66500327a90d0a105eedeb':
  dxva2: Increase maximum number of slices for mpeg2

See: bceeccc648baf94a02b7b2c53e44bf77a47773ef
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '5b977c1d4fd99f325049d48fb8f0a3240d50eef8'
Michael Niedermayer [Thu, 6 Mar 2014 22:53:36 +0000 (23:53 +0100)]
Merge commit '5b977c1d4fd99f325049d48fb8f0a3240d50eef8'

* commit '5b977c1d4fd99f325049d48fb8f0a3240d50eef8':
  mxf: Return meaningful errors

Conflicts:
libavformat/mxfdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'f06f6daaf8538eb8ceeb690b761f1256771b6ba6'
Michael Niedermayer [Thu, 6 Mar 2014 22:44:29 +0000 (23:44 +0100)]
Merge commit 'f06f6daaf8538eb8ceeb690b761f1256771b6ba6'

* commit 'f06f6daaf8538eb8ceeb690b761f1256771b6ba6':
  mxf: Parse random index pack

Conflicts:
libavformat/mxfdec.c

See: f5ed83c3831fcaca0f87cd67ca743946a54023d0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '570af382eea902afe09f3562e5e1b483981cca7e'
Michael Niedermayer [Thu, 6 Mar 2014 21:58:46 +0000 (22:58 +0100)]
Merge commit '570af382eea902afe09f3562e5e1b483981cca7e'

* commit '570af382eea902afe09f3562e5e1b483981cca7e':
  mxf: Handle identification metadata

Conflicts:
libavformat/mxfdec.c

See: 25b143aa7bd60d348a449be64dadab61f0c7d068
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '5b930092c3afd2ae01f1c8aa7fb405911d6ad416'
Michael Niedermayer [Thu, 6 Mar 2014 21:39:18 +0000 (22:39 +0100)]
Merge commit '5b930092c3afd2ae01f1c8aa7fb405911d6ad416'

* commit '5b930092c3afd2ae01f1c8aa7fb405911d6ad416':
  mxf: Set audio packets pts

Conflicts:
libavformat/mxfdec.c

See: 83cab07a4c7f8ee1521c49e387b7d86de78d1955
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'e118bb1a33889d4df56f28975b4fd0793b4f5c32'
Michael Niedermayer [Thu, 6 Mar 2014 21:19:01 +0000 (22:19 +0100)]
Merge commit 'e118bb1a33889d4df56f28975b4fd0793b4f5c32'

* commit 'e118bb1a33889d4df56f28975b4fd0793b4f5c32':
  mxf: Introduce ff_mxf_get_samples_per_frame

Conflicts:
libavformat/mxf.c
libavformat/mxf.h

See: 906a2638139bfcce17d423cfa3a8ee633b38a2af
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'd48430c367947a64647c6959cf472f2c01778b17'
Michael Niedermayer [Thu, 6 Mar 2014 21:04:51 +0000 (22:04 +0100)]
Merge commit 'd48430c367947a64647c6959cf472f2c01778b17'

* commit 'd48430c367947a64647c6959cf472f2c01778b17':
  build: Let the SVQ3 decoder depend on the H.264 decoder

Conflicts:
libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '84bf8817206126dab3c9abf6055b593389bcb241'
Michael Niedermayer [Thu, 6 Mar 2014 20:58:46 +0000 (21:58 +0100)]
Merge commit '84bf8817206126dab3c9abf6055b593389bcb241'

* commit '84bf8817206126dab3c9abf6055b593389bcb241':
  configure: Split x86 SIMD architecture extensions into separate list

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolibx265: Support API version 9
Derek Buitenhuis [Thu, 6 Mar 2014 20:01:17 +0000 (20:01 +0000)]
libx265: Support API version 9

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoFix spelling errors in texi files: accomodate -> accommodate allows to -> allows...
Andreas Cadhalpun [Thu, 6 Mar 2014 18:07:53 +0000 (19:07 +0100)]
Fix spelling errors in texi files: accomodate -> accommodate allows to -> allows one to choosen -> chosen compability -> compatibility explictly -> explicitly overriden -> overridden specifed -> specified Trasmission -> Transmission

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoFix spelling error 'Inconsistant -> Inconsistent'
Andreas Cadhalpun [Thu, 6 Mar 2014 18:03:07 +0000 (19:03 +0100)]
Fix spelling error 'Inconsistant -> Inconsistent'

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoCorrect the FSF address for two avisynth files to '51 Franklin Street, Fifth Floor...
Andreas Cadhalpun [Thu, 6 Mar 2014 17:58:04 +0000 (18:58 +0100)]
Correct the FSF address for two avisynth files to '51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA'

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodxva2: Increase maximum number of slices for mpeg2
Rainer Hochecker [Thu, 6 Mar 2014 13:40:43 +0000 (14:40 +0100)]
dxva2: Increase maximum number of slices for mpeg2

Some content requires an higher number of slices in order to
render properly.

Rise the number to 1024 and warn if ever it exceeds.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agomxf: Return meaningful errors
Luca Barbato [Wed, 8 Jan 2014 00:51:48 +0000 (01:51 +0100)]
mxf: Return meaningful errors

4 years agomxf: Parse random index pack
Paul B Mahol [Fri, 18 Oct 2013 10:44:56 +0000 (10:44 +0000)]
mxf: Parse random index pack

Get the last partition offset and use it when footer partition
offset is missing.

Footer partition may not be present and even if present footer
partition offset may not be set in any partition except last one.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agomxf: Handle identification metadata
Matthieu Bouron [Fri, 29 Mar 2013 13:09:31 +0000 (14:09 +0100)]
mxf: Handle identification metadata

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agomxf: Set audio packets pts
Matthieu Bouron [Thu, 13 Sep 2012 19:15:48 +0000 (21:15 +0200)]
mxf: Set audio packets pts

Extrapolate audio timestamps based on the number of samples demuxed.

Deal with some MXF nastiness involving fractional number of
samples per EditUnit when seeking (the specs handwave this away).

Further fixes from Tomas Härdin.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agomxf: Introduce ff_mxf_get_samples_per_frame
Matthieu Bouron [Thu, 20 Sep 2012 18:31:28 +0000 (20:31 +0200)]
mxf: Introduce ff_mxf_get_samples_per_frame

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agox86/dsputil: add emms to ff_scalarproduct_int16_mmxext()
James Almer [Wed, 5 Mar 2014 22:44:36 +0000 (19:44 -0300)]
x86/dsputil: add emms to ff_scalarproduct_int16_mmxext()

Also undo the changes to ra144enc.c from previous commits.
Should fix ticket #3429

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agobuild: Let the SVQ3 decoder depend on the H.264 decoder
Diego Biurrun [Thu, 6 Mar 2014 12:04:03 +0000 (13:04 +0100)]
build: Let the SVQ3 decoder depend on the H.264 decoder

The SVQ3 decoder reuses large parts of the H.264 decoder so it
makes no sense to enable the former but not the latter.

Also drop unnecessary h263.o object from SVQ3 decoder object list.

4 years agolibx265: Use ctx->vui. instead of ctx-> for some options A recent change in libx265...
sfan5 [Thu, 6 Mar 2014 15:00:30 +0000 (16:00 +0100)]
libx265: Use ctx->vui. instead of ctx-> for some options A recent change in libx265 moved some options such as sar_width into a 'vui' struct.

Signed-off-by: sfan5 <sfan5@live.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_shuffleplanes: Fix flags / add AV_OPT_FLAG_FILTERING_PARAM
Michael Niedermayer [Thu, 6 Mar 2014 15:58:24 +0000 (16:58 +0100)]
avfilter/vf_shuffleplanes: Fix flags / add AV_OPT_FLAG_FILTERING_PARAM

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavd/Makefile: Add fbdev_common.h to SKIPHEADERS
James Almer [Thu, 6 Mar 2014 04:39:25 +0000 (01:39 -0300)]
lavd/Makefile: Add fbdev_common.h to SKIPHEADERS

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 6 Mar 2014 13:59:58 +0000 (14:59 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vf_shuffleplanes: fix the type of the mapping indices

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '3bfdee00cd92ff07c364d4901c4aefda32780756'
Michael Niedermayer [Thu, 6 Mar 2014 13:09:48 +0000 (14:09 +0100)]
Merge commit '3bfdee00cd92ff07c364d4901c4aefda32780756'

* commit '3bfdee00cd92ff07c364d4901c4aefda32780756':
  x86: dcadsp: Fix linking with yasm and optimizations disabled

Conflicts:
libavcodec/x86/dcadsp_init.c

See: 206167a295a5c28cec3c38f7308835b0b7e0618f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoconfigure: Split x86 SIMD architecture extensions into separate list
Diego Biurrun [Sat, 2 Nov 2013 16:21:53 +0000 (17:21 +0100)]
configure: Split x86 SIMD architecture extensions into separate list

This avoids checking inline/external assembly dependencies for x86
extensions that do not play a role in inline/external assembly.

4 years agoMerge commit 'e1f2987b10112489f6da5501d4c8735a798c9e3f'
Michael Niedermayer [Thu, 6 Mar 2014 12:09:06 +0000 (13:09 +0100)]
Merge commit 'e1f2987b10112489f6da5501d4c8735a798c9e3f'

* commit 'e1f2987b10112489f6da5501d4c8735a798c9e3f':
  FATE: add tests for the shuffleplanes filter

Conflicts:
tests/fate/filter-video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '599b81ca9a8e04a27ddad94af462171d16063167'
Michael Niedermayer [Thu, 6 Mar 2014 11:51:10 +0000 (12:51 +0100)]
Merge commit '599b81ca9a8e04a27ddad94af462171d16063167'

* commit '599b81ca9a8e04a27ddad94af462171d16063167':
  lavfi: add shuffleplanes filter

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'bba2a7cc5f7c7aaa32a938f3d4edd9f555f39cdb'
Michael Niedermayer [Thu, 6 Mar 2014 11:38:05 +0000 (12:38 +0100)]
Merge commit 'bba2a7cc5f7c7aaa32a938f3d4edd9f555f39cdb'

* commit 'bba2a7cc5f7c7aaa32a938f3d4edd9f555f39cdb':
  lavfi: use the correct filter context for logging an error.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agovf_shuffleplanes: fix the type of the mapping indices
Anton Khirnov [Thu, 6 Mar 2014 07:32:50 +0000 (08:32 +0100)]
vf_shuffleplanes: fix the type of the mapping indices

They are TYPE_INT AVOptions, so they must be ints

4 years agoRevert "lavu/buffer: add release function"
Lukasz Marek [Sun, 2 Mar 2014 16:47:19 +0000 (17:47 +0100)]
Revert "lavu/buffer: add release function"

This reverts commit 3144440004941aa22ffea9933f5e5dfe826df654.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge remote-tracking branch 'lukaszmluki/master'
Michael Niedermayer [Thu, 6 Mar 2014 01:04:15 +0000 (02:04 +0100)]
Merge remote-tracking branch 'lukaszmluki/master'

* lukaszmluki/master:
  lavd/avdevice: always free detected devices on error
  lavf/http: return error from seek on invalid whence
  lavf/http: return error on seeking to negative postion
  lavf/avio: fix ffurl_alloc error checks

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agolavd/avdevice: always free detected devices on error
Lukasz Marek [Tue, 4 Mar 2014 01:57:27 +0000 (02:57 +0100)]
lavd/avdevice: always free detected devices on error

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
4 years agolavf/http: return error from seek on invalid whence
Lukasz Marek [Thu, 27 Feb 2014 23:36:07 +0000 (00:36 +0100)]
lavf/http: return error from seek on invalid whence

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
4 years agolavf/http: return error on seeking to negative postion
Lukasz Marek [Thu, 27 Feb 2014 23:36:06 +0000 (00:36 +0100)]
lavf/http: return error on seeking to negative postion

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
4 years agolavf/avio: fix ffurl_alloc error checks
Lukasz Marek [Fri, 28 Feb 2014 00:12:07 +0000 (01:12 +0100)]
lavf/avio: fix ffurl_alloc error checks

ffurl_alloc doc says it returns >= 0 in case of success.
avio treats non-zero as errors.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
4 years agox86: dcadsp: Fix linking with yasm and optimizations disabled
Diego Biurrun [Tue, 4 Mar 2014 18:40:21 +0000 (19:40 +0100)]
x86: dcadsp: Fix linking with yasm and optimizations disabled

Some optimized functions reference optimized symbols, so the functions
must be explicitly disabled when those symbols are unavailable.

4 years agohttp: handle ICY in presence of chunked transfer encoding
wm4 [Sun, 2 Mar 2014 19:26:19 +0000 (20:26 +0100)]
http: handle ICY in presence of chunked transfer encoding

Some http servers send an ICY stream in combination with chunked
transfer encoding. This case was handled incorrectly by the ICY code:
instead of handling chunked encoding before anything ICY related, both
were mixed.

Fix this by separating the ICY code from normal http reading. Move the
normal http reading to a new function http_read_stream(), while
http_read() handles ICY on top of http_read_stream().

The server identified itself as: cloudflare-nginx

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoFix pthread-related compile errors in iec61883.c
Andrey Myznikov [Wed, 5 Mar 2014 16:21:07 +0000 (18:21 +0200)]
Fix pthread-related compile errors in iec61883.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc/APIchanges: fill in missing version for "2013-11-14 - 31c09b7 / 728c465 - lavc...
Michael Niedermayer [Wed, 5 Mar 2014 21:02:09 +0000 (22:02 +0100)]
doc/APIchanges: fill in missing version for "2013-11-14 - 31c09b7 / 728c465 - lavc 55.26.0 - vdpau.h"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoFATE: add tests for the shuffleplanes filter
Anton Khirnov [Mon, 24 Feb 2014 10:32:16 +0000 (11:32 +0100)]
FATE: add tests for the shuffleplanes filter

4 years agolavfi: add shuffleplanes filter
Anton Khirnov [Sun, 23 Feb 2014 14:38:13 +0000 (15:38 +0100)]
lavfi: add shuffleplanes filter

4 years agolavfi: use the correct filter context for logging an error.
Anton Khirnov [Sun, 23 Feb 2014 14:40:06 +0000 (15:40 +0100)]
lavfi: use the correct filter context for logging an error.

4 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 5 Mar 2014 20:34:08 +0000 (21:34 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  arm: hpeldsp: prevent overreads in armv6 asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '3741aa37c2a0d0717faff74a5c4cc357d16f6d1d'
Michael Niedermayer [Wed, 5 Mar 2014 20:26:11 +0000 (21:26 +0100)]
Merge commit '3741aa37c2a0d0717faff74a5c4cc357d16f6d1d'

* commit '3741aa37c2a0d0717faff74a5c4cc357d16f6d1d':
  x86: cabac: Use correct #includes to make header compile standalone

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/oggparsevorbis: dont use invalid granules
Michael Niedermayer [Wed, 5 Mar 2014 16:07:28 +0000 (17:07 +0100)]
avformat/oggparsevorbis: dont use invalid granules

Fixes Ticket3437

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc/examples/remuxing: dont use the input codec_tag, it may be invalid tor the output
Jason Hsu [Tue, 4 Mar 2014 07:11:57 +0000 (15:11 +0800)]
doc/examples/remuxing: dont use the input codec_tag, it may be invalid tor the output

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoarm: hpeldsp: prevent overreads in armv6 asm
Janne Grunau [Wed, 5 Mar 2014 11:44:57 +0000 (12:44 +0100)]
arm: hpeldsp: prevent overreads in armv6 asm

Based on a patch by Russel King <rmk+libav@arm.linux.org.uk>

Bug-Id: 646
CC: libav-stable@libav.org
4 years agoavcodec/ra144enc: avoid calling emms when the SSE2 version is used
Michael Niedermayer [Wed, 5 Mar 2014 13:17:55 +0000 (14:17 +0100)]
avcodec/ra144enc: avoid calling emms when the SSE2 version is used

emms is a rather slow operation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agora144enc: fix use of scalarprod_int16
Christophe Gisquet [Wed, 5 Mar 2014 12:00:23 +0000 (13:00 +0100)]
ra144enc: fix use of scalarprod_int16

c3390fd56cf55259ea7665ecea6c8aeddf56e2fc made use of the DSP function
but did not complement it with a call to emms, which is done here before
computations involving floats are performed.

Fixes ticket #3429, which affected MMX/MMXExt machines.

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

* qatar/master:
  avfilter: Add missing emms_c when needed

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '5ddc9f5052316608799b932c604f9e7561f8ce24'
Michael Niedermayer [Wed, 5 Mar 2014 12:44:42 +0000 (13:44 +0100)]
Merge commit '5ddc9f5052316608799b932c604f9e7561f8ce24'

* commit '5ddc9f5052316608799b932c604f9e7561f8ce24':
  configure: enable PIC on s390(x)

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agox86: cabac: Use correct #includes to make header compile standalone
Diego Biurrun [Tue, 4 Mar 2014 18:26:28 +0000 (19:26 +0100)]
x86: cabac: Use correct #includes to make header compile standalone

4 years agoMerge commit 'eeaf4f3b87815cbae4c12856cfaafb3a2dae8e0c'
Michael Niedermayer [Wed, 5 Mar 2014 10:48:39 +0000 (11:48 +0100)]
Merge commit 'eeaf4f3b87815cbae4c12856cfaafb3a2dae8e0c'

* commit 'eeaf4f3b87815cbae4c12856cfaafb3a2dae8e0c':
  av_vdpau_get_profile: mask out H.264 intra profile flag

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter: Add missing emms_c when needed
Luca Barbato [Wed, 5 Mar 2014 09:41:33 +0000 (10:41 +0100)]
avfilter: Add missing emms_c when needed

Arch specific calls should have an emms_c following to keep the cpu
state consistent.

Reported-By: wm4
CC: libav-stable@libav.org
4 years agoconfigure: enable PIC on s390(x)
Reinhard Tartler [Sun, 2 Mar 2014 07:11:05 +0000 (02:11 -0500)]
configure: enable PIC on s390(x)

The s390 architecture requires shared libraries to be built in PIC mode.
Otherwise applications will get wrong relocations at run-time, leading
to confusing segmentation faults.

CC: libav-stable@libav.org
4 years agompegts: use goto out instead of break on truncated or invalid pmt tables
Marton Balint [Sun, 2 Mar 2014 17:34:48 +0000 (18:34 +0100)]
mpegts: use goto out instead of break on truncated or invalid pmt tables

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agox86/synth_filter: add synth_filter_fma3
James Almer [Sat, 1 Mar 2014 18:26:51 +0000 (15:26 -0300)]
x86/synth_filter: add synth_filter_fma3

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoAdd "prefer_tcp" flag to "rtsp_flags"
Andrey Utkin [Tue, 4 Mar 2014 13:43:59 +0000 (15:43 +0200)]
Add "prefer_tcp" flag to "rtsp_flags"

If set, and if TCP is available as RTSP RTP transport, then TCP will be
tried first as RTP transport.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoav_vdpau_get_profile: mask out H.264 intra profile flag
Rémi Denis-Courmont [Tue, 4 Mar 2014 19:13:09 +0000 (19:13 +0000)]
av_vdpau_get_profile: mask out H.264 intra profile flag

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
4 years agox86/synth_filter: add missing HAVE_YASM guard
James Almer [Tue, 4 Mar 2014 08:47:38 +0000 (05:47 -0300)]
x86/synth_filter: add missing HAVE_YASM guard

Should fix compilation failures with --disable-yasm on some compilers

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '3407172b36a93cec410c6a287dbeec0f41257512'
Michael Niedermayer [Tue, 4 Mar 2014 21:17:51 +0000 (22:17 +0100)]
Merge commit '3407172b36a93cec410c6a287dbeec0f41257512'

* commit '3407172b36a93cec410c6a287dbeec0f41257512':
  avienc: K&R formatting cosmetics

Conflicts:
libavformat/avienc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '4c41a7a1798dd6c60e40f79be12faa98a9347151'
Michael Niedermayer [Tue, 4 Mar 2014 21:01:24 +0000 (22:01 +0100)]
Merge commit '4c41a7a1798dd6c60e40f79be12faa98a9347151'

* commit '4c41a7a1798dd6c60e40f79be12faa98a9347151':
  vf_frei0r: fix missing end of line character

Conflicts:
libavfilter/vf_frei0r.c

No change as the token parsing change was not merged

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'a18ef7a76c735bcf78ed4825e33ad7f9f6f77a54'
Michael Niedermayer [Tue, 4 Mar 2014 20:55:16 +0000 (21:55 +0100)]
Merge commit 'a18ef7a76c735bcf78ed4825e33ad7f9f6f77a54'

* commit 'a18ef7a76c735bcf78ed4825e33ad7f9f6f77a54':
  doc: fix a couple of typos in frame.h

Conflicts:
libavutil/frame.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavienc: K&R formatting cosmetics
Keiji Costantini [Fri, 28 Feb 2014 18:58:20 +0000 (19:58 +0100)]
avienc: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
4 years agovf_frei0r: fix missing end of line character
Vittorio Giovara [Tue, 4 Mar 2014 17:27:09 +0000 (18:27 +0100)]
vf_frei0r: fix missing end of line character

Error introduced in 61b323ce7c7cdc101eadfd7de2203922b8a39e8d.

4 years agodoc: fix a couple of typos in frame.h
Vittorio Giovara [Tue, 4 Mar 2014 14:16:51 +0000 (15:16 +0100)]
doc: fix a couple of typos in frame.h

4 years agoavformat/mpegtsenc: fix HEVC MPEG TS stream type
olugbone [Mon, 3 Mar 2014 19:32:41 +0000 (19:32 +0000)]
avformat/mpegtsenc: fix HEVC MPEG TS stream type

Allowing HEVC video using TS stream type 0x24

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

* qatar/master:
  put_bits: Remove unused includes

Conflicts:
libavcodec/put_bits.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '5397386effba2e53e4ff82852a86f6be4d59e9c1'
Michael Niedermayer [Tue, 4 Mar 2014 12:37:58 +0000 (13:37 +0100)]
Merge commit '5397386effba2e53e4ff82852a86f6be4d59e9c1'

* commit '5397386effba2e53e4ff82852a86f6be4d59e9c1':
  mathops: move macro to the only place it is used

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '61b323ce7c7cdc101eadfd7de2203922b8a39e8d'
Michael Niedermayer [Tue, 4 Mar 2014 12:26:48 +0000 (13:26 +0100)]
Merge commit '61b323ce7c7cdc101eadfd7de2203922b8a39e8d'

* commit '61b323ce7c7cdc101eadfd7de2203922b8a39e8d':
  vf_frei0r: refactor library loading from env variable

Conflicts:
configure
libavfilter/vf_frei0r.c

Not merged, we use av_strtok() which leads to simpler code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '4e0be9c86f2003dd3ba2eb8fad01e8d0e538075e'
Michael Niedermayer [Tue, 4 Mar 2014 11:50:45 +0000 (12:50 +0100)]
Merge commit '4e0be9c86f2003dd3ba2eb8fad01e8d0e538075e'

* commit '4e0be9c86f2003dd3ba2eb8fad01e8d0e538075e':
  vf_frei0r: prevent a segfault when filter parameters are not set

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '8accddeb5806cd98e3803b4ddf2a2ef576d0e4d9'
Michael Niedermayer [Tue, 4 Mar 2014 11:41:31 +0000 (12:41 +0100)]
Merge commit '8accddeb5806cd98e3803b4ddf2a2ef576d0e4d9'

* commit '8accddeb5806cd98e3803b4ddf2a2ef576d0e4d9':
  vf_frei0r: adjust error messages

Conflicts:
libavfilter/vf_frei0r.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoput_bits: Remove unused includes
Vittorio Giovara [Wed, 26 Feb 2014 01:26:29 +0000 (02:26 +0100)]
put_bits: Remove unused includes

This requires adding includes to other files that relied on these being
included implicitly.