generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
61,244 Commits 24 Branches 241 Tags 173 MiB
9563e67e07
Commit Graph

61244 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
64e4bd7414 doc/APIchanges: update versions & hashes 2014-03-07 00:47:55 +01:00
Hendrik Leppkes
8b2a130d3f 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>
 2014-03-07 00:33:34 +01:00
Hendrik Leppkes
276839b8de 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>
 2014-03-07 00:33:19 +01:00
Michael Niedermayer
0707a34dd8 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  libx265: Support API version 9

See: 69ead9af75
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-07 00:15:49 +01:00
Michael Niedermayer
b7c1f6f9cc Merge commit 'b66382101cff33e2ce66500327a90d0a105eedeb' 
* commit 'b66382101cff33e2ce66500327a90d0a105eedeb':
  dxva2: Increase maximum number of slices for mpeg2

See: bceeccc648
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-07 00:06:43 +01:00
Michael Niedermayer
39f5003a07 Merge commit '5b977c1d4fd99f325049d48fb8f0a3240d50eef8' 
* commit '5b977c1d4fd99f325049d48fb8f0a3240d50eef8':
  mxf: Return meaningful errors

Conflicts:
	libavformat/mxfdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-06 23:53:36 +01:00
Michael Niedermayer
618d2262d7 Merge commit 'f06f6daaf8538eb8ceeb690b761f1256771b6ba6' 
* commit 'f06f6daaf8538eb8ceeb690b761f1256771b6ba6':
  mxf: Parse random index pack

Conflicts:
	libavformat/mxfdec.c

See: f5ed83c383
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-06 23:45:05 +01:00
Michael Niedermayer
5a4852bc4d Merge commit '570af382eea902afe09f3562e5e1b483981cca7e' 
* commit '570af382eea902afe09f3562e5e1b483981cca7e':
  mxf: Handle identification metadata

Conflicts:
	libavformat/mxfdec.c

See: 25b143aa7b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-06 22:59:35 +01:00
Michael Niedermayer
3ce8581413 Merge commit '5b930092c3afd2ae01f1c8aa7fb405911d6ad416' 
* commit '5b930092c3afd2ae01f1c8aa7fb405911d6ad416':
  mxf: Set audio packets pts

Conflicts:
	libavformat/mxfdec.c

See: 83cab07a4c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-06 22:50:06 +01:00
Michael Niedermayer
2265212396 Merge commit 'e118bb1a33889d4df56f28975b4fd0793b4f5c32' 
* commit 'e118bb1a33889d4df56f28975b4fd0793b4f5c32':
  mxf: Introduce ff_mxf_get_samples_per_frame

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

See: 906a263813
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-06 22:21:57 +01:00
Michael Niedermayer
1618f162a9 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>
 2014-03-06 22:04:51 +01:00
Michael Niedermayer
85d2b0987b Merge commit '84bf8817206126dab3c9abf6055b593389bcb241' 
* commit '84bf8817206126dab3c9abf6055b593389bcb241':
  configure: Split x86 SIMD architecture extensions into separate list

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-06 21:58:46 +01:00
Derek Buitenhuis
d67dbfa7c1 libx265: Support API version 9 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-03-06 20:21:27 +00:00
Andreas Cadhalpun
9898bd9a82 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>
 2014-03-06 21:12:40 +01:00
Andreas Cadhalpun
eeb3baf7f7 Fix spelling error 'Inconsistant -> Inconsistent' 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-06 20:44:45 +01:00
Andreas Cadhalpun
64b6164b72 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>
 2014-03-06 20:44:33 +01:00
Rainer Hochecker
b66382101c 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>
 2014-03-06 19:28:20 +01:00
Luca Barbato
5b977c1d4f mxf: Return meaningful errors 2014-03-06 19:28:20 +01:00
Paul B Mahol
f06f6daaf8 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>
 2014-03-06 19:28:20 +01:00
Matthieu Bouron
570af382ee mxf: Handle identification metadata 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-03-06 19:28:20 +01:00
Matthieu Bouron
5b930092c3 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>
 2014-03-06 19:28:20 +01:00
Matthieu Bouron
e118bb1a33 mxf: Introduce ff_mxf_get_samples_per_frame 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-03-06 19:28:20 +01:00
James Almer
9e0e1f9067 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>
 2014-03-06 18:23:55 +01:00
Diego Biurrun
d48430c367 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.
 2014-03-06 18:23:41 +01:00
sfan5
69ead9af75 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>
 2014-03-06 17:07:46 +01:00
Michael Niedermayer
ffe7e7c195 avfilter/vf_shuffleplanes: Fix flags / add AV_OPT_FLAG_FILTERING_PARAM 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-06 16:58:24 +01:00
James Almer
99b4da73c8 lavd/Makefile: Add fbdev_common.h to SKIPHEADERS 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-06 15:42:15 +01:00
Michael Niedermayer
d168729004 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  vf_shuffleplanes: fix the type of the mapping indices

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-06 15:18:14 +01:00
Michael Niedermayer
2d99de66b7 Merge commit '3bfdee00cd92ff07c364d4901c4aefda32780756' 
* commit '3bfdee00cd92ff07c364d4901c4aefda32780756':
  x86: dcadsp: Fix linking with yasm and optimizations disabled

Conflicts:
	libavcodec/x86/dcadsp_init.c

See: 206167a295
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-06 14:10:27 +01:00
Diego Biurrun
84bf881720 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.
 2014-03-06 13:29:00 +01:00
Michael Niedermayer
7011aab501 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>
 2014-03-06 13:09:06 +01:00
Michael Niedermayer
2fb0027c26 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>
 2014-03-06 13:07:20 +01:00
Michael Niedermayer
b76059058a Merge commit 'bba2a7cc5f7c7aaa32a938f3d4edd9f555f39cdb' 
* commit 'bba2a7cc5f7c7aaa32a938f3d4edd9f555f39cdb':
  lavfi: use the correct filter context for logging an error.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-06 12:38:09 +01:00
Anton Khirnov
713d3f98c8 vf_shuffleplanes: fix the type of the mapping indices 
They are TYPE_INT AVOptions, so they must be ints
 2014-03-06 09:24:53 +01:00
Lukasz Marek
bba7b6fc41 Revert "lavu/buffer: add release function" 
This reverts commit 3144440004.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-06 03:23:40 +01:00
Michael Niedermayer
c832bf0c38 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>
 2014-03-06 02:04:18 +01:00
Lukasz Marek
2475fdbd04 lavd/avdevice: always free detected devices on error 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
 2014-03-06 00:34:50 +01:00
Lukasz Marek
1aa262f460 lavf/http: return error from seek on invalid whence 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
 2014-03-06 00:32:24 +01:00
Lukasz Marek
4ba6a534dc lavf/http: return error on seeking to negative postion 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
 2014-03-06 00:32:20 +01:00
Lukasz Marek
f495fbe76a 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>
 2014-03-06 00:30:27 +01:00
Diego Biurrun
3bfdee00cd 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.
 2014-03-05 23:16:21 +01:00
wm4
636273d3d4 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>
 2014-03-05 22:49:36 +01:00
Andrey Myznikov
9deecdf85f Fix pthread-related compile errors in iec61883.c 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-05 22:19:33 +01:00
Michael Niedermayer
91550f46cd 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>
 2014-03-05 22:02:09 +01:00
Anton Khirnov
e1f2987b10 FATE: add tests for the shuffleplanes filter 2014-03-05 21:52:03 +01:00
Anton Khirnov
599b81ca9a lavfi: add shuffleplanes filter 2014-03-05 21:52:02 +01:00
Anton Khirnov
bba2a7cc5f lavfi: use the correct filter context for logging an error. 2014-03-05 21:52:02 +01:00
Michael Niedermayer
a74bab7079 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  arm: hpeldsp: prevent overreads in armv6 asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-05 21:35:30 +01:00
Michael Niedermayer
146b476ba0 Merge commit '3741aa37c2a0d0717faff74a5c4cc357d16f6d1d' 
* commit '3741aa37c2a0d0717faff74a5c4cc357d16f6d1d':
  x86: cabac: Use correct #includes to make header compile standalone

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-05 21:33:44 +01:00
Michael Niedermayer
12b97dd375 avformat/oggparsevorbis: dont use invalid granules 
Fixes Ticket3437

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-05 17:07:28 +01:00