videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity
74,022 Commits 36 Branches 392 Tags 193 MiB
Commit Graph

74022 Commits

Author SHA1 Message Date
Michael Niedermayer 508b79e6c1 Merge commit '41d47ea85fb4ad9cfb5c2dc808a46bc1d57f3986' 
* commit '41d47ea85fb4ad9cfb5c2dc808a46bc1d57f3986':
  lavc: add Intel libmfx-based HEVC decoder.

Conflicts:
	Changelog
	configure
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/qsvdec.c
	libavcodec/qsvdec_h2645.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-26 01:20:46 +02:00
Michael Niedermayer bb619f41be Merge commit 'bf52f773913cf74bdf0d2c8c2cb4473fa1b7801e' 
* commit 'bf52f773913cf74bdf0d2c8c2cb4473fa1b7801e':
  lavc: add Intel libmfx-based MPEG2 decoder.

Conflicts:
	configure
	libavcodec/qsvdec_mpeg2.c

Some cosmetics merged, rest is related to the removed parser code and
thus not merged

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-26 00:59:57 +02:00
Timo Rothenpieler 9f4bff834c avcodec/nvenc: Delay frame output to increase encoding speed 2015-07-26 00:52:15 +02:00
Michael Niedermayer 15bcbc9d3b Merge commit 'f89f78c1c563d98f10ee1d7e1ed67c9f9e03b741' 
* commit 'f89f78c1c563d98f10ee1d7e1ed67c9f9e03b741':
  lavc: add a HEVC mp4->annex B bitstream filter

Conflicts:
	Changelog

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-26 00:34:27 +02:00
Michael Niedermayer a822c3bd79 Merge commit '96dca089b19bf55293136277f5b081c56146e10e' 
* commit '96dca089b19bf55293136277f5b081c56146e10e':
  qsvdec: move qsv_process_data() from qsvdec_h264 to the common code

Conflicts:
	libavcodec/qsvdec.c
	libavcodec/qsvdec_h264.c

No change as the parser code has been removed

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-26 00:24:31 +02:00
Paul B Mahol 62aab839f8 avfilter/Makefile: fix order of framestep filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-07-25 22:07:25 +00:00
Paul B Mahol c1fa846d0c avfilter: add sidechain compress audio filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-07-25 22:07:20 +00:00
Michael Niedermayer af08d8bfbb Merge commit 'fa85fcf2b7d1ab822a59245077b8bb855406d3e9' 
* commit 'fa85fcf2b7d1ab822a59245077b8bb855406d3e9':
  qsvenc_hevc: fix enum declaration

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-25 23:47:54 +02:00
Timo Rothenpieler 15cd2f8ea9 avcodec/nvenc: Remove unused parameter 2015-07-25 23:43:16 +02:00
Michael Niedermayer c3413a712a Merge commit '22522d9c2c69624fe4d81d61ee65a56610f22f1d' 
* commit '22522d9c2c69624fe4d81d61ee65a56610f22f1d':
  qsvdec: fix a memleak of async_fifo

Conflicts:
	libavcodec/qsvdec.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-25 23:28:39 +02:00
Michael Niedermayer ef2a85ac53 Merge commit 'aa9d15d89bb4ee8a31607d3db1b8c5334eb88d2d' 
* commit 'aa9d15d89bb4ee8a31607d3db1b8c5334eb88d2d':
  qsvdec: avoid an infinite loop with no consumed data and no output

Conflicts:
	libavcodec/qsvdec.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-25 23:10:14 +02:00
Michael Niedermayer c105e0f077 avcodec/aacps_fixed_tablegen: change f_center to 64bit to avoid overflow 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-25 22:07:41 +02:00
Michael Niedermayer e171309756 avutil/softfloat: Add a test for av_sincos_sf() 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-25 21:42:42 +02:00
Ivan Uskov fb57bc6c34 avcodec: Add QSV VC-1 video decoder. 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-25 19:32:22 +02:00
Michael Niedermayer 7ec5115409 avformat/nutenc: Omit AV_PKT_DATA_QUALITY_STATS when storing side data. 
This side data does not serve or improve decoding the data, it thus
would semantically be metadata and not side data.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-25 18:39:17 +02:00
Anton Khirnov 41d47ea85f lavc: add Intel libmfx-based HEVC decoder. 2015-07-25 17:37:01 +02:00
Anton Khirnov bf52f77391 lavc: add Intel libmfx-based MPEG2 decoder. 2015-07-25 17:36:59 +02:00
Ivan Uskov 6d0123f40e avcodec: Add QSV MPEG-2 video decoder. 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-25 17:31:18 +02:00
Anton Khirnov f89f78c1c5 lavc: add a HEVC mp4->annex B bitstream filter 2015-07-25 17:26:53 +02:00
Anton Khirnov 96dca089b1 qsvdec: move qsv_process_data() from qsvdec_h264 to the common code 
It will be shared with the upcoming mpeg2 and hevc decoders.
 2015-07-25 17:24:25 +02:00
Anton Khirnov fa85fcf2b7 qsvenc_hevc: fix enum declaration 
Declare a named enum, not a variable with anonymous enum type.
 2015-07-25 17:24:03 +02:00
Anton Khirnov 22522d9c2c qsvdec: fix a memleak of async_fifo 
init() is called whenever format changes, so current code would leak the
fifo in this case.
 2015-07-25 17:23:46 +02:00
Anton Khirnov aa9d15d89b qsvdec: avoid an infinite loop with no consumed data and no output 
This is triggerable with the HEVC decoder. It is unclear yet whether the
bug is in the calling code or the MSDK, but it seems better to check for
this in any case.
 2015-07-25 17:23:29 +02:00
Michael Niedermayer 38490e0724 avcodec/dvdec: only attempt to conceal errors based on STA inconsistencies when error_concealment is set 
This allows the user to disable it in the hypothetical case that STA values are wrong

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-25 15:27:44 +02:00
Michael Niedermayer bbad3811cc avcodec/aacps: Fix ;; 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-25 14:07:55 +02:00
Michael Niedermayer f267d553f7 avcodec/aactab: Add ff_aac_eld_window_480_fixed 
Fixes pointer type mismatch

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-25 13:59:53 +02:00
Michael Niedermayer 17cc35c76b avcodec/aactab: Fix rounding of elements in ff_aac_eld_window_512_fixed 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-25 13:19:06 +02:00
Michael Niedermayer 1909a9151c swscale/output: Fix "warning: assignment from incompatible pointer type" 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-25 03:15:56 +02:00
Zhang Rui 8a17335189 avformat/async: wake up main thread before exit background thread 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-25 02:26:01 +02:00
Zhang Rui c0a4af408e avformat/async: move more code into locked area in background thread 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-25 01:43:44 +02:00
Michael Niedermayer dee551bbd2 avcodec/dvdec: skip 3rd stage ac decoding when the headers indicates that the data is inconsistent 
Fixes Ticket1589

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-25 00:27:38 +02:00
Shivraj Patil e21b090bfb avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for VP9 intra functions 
Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-24 22:51:34 +02:00
Hendrik Leppkes 0c0cd34f9c configure: fix LARGEADDRESSAWARE flag with MSVC 
Otherwise it would get translated like a library path (-L option),
which breaks setting the flag.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-24 21:56:10 +02:00
James Almer ede590c84d avcodec/aacsbr: add missing header include 
Fixes make checkheaders

Signed-off-by: James Almer <jamrial@gmail.com>
 2015-07-24 16:27:52 -03:00
Michael Niedermayer dae79a185f Merge commit 'c9edbe4af901e9bc9f05a62319637f9760df9a4a' 
* commit 'c9edbe4af901e9bc9f05a62319637f9760df9a4a':
  use a wrapper script to call MS link.exe to avoid mixing with /usr/bin/link.exe

See: 58ed7b6328
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-24 20:02:48 +02:00
Steve Lhomme 58ed7b6328 use a wrapper script to call MS link.exe to avoid mixing with /usr/bin/link.exe 
favor link over link.exe in case some wrapper script already exists
fallback to "link" in the path if the one next to cl is not found

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-24 20:02:32 +02:00
Michael Niedermayer daf6bce71b avcodec/dvdec: Retry decoding seemingly damaged MBs while skiping likely damaged parts 
Improves decoding of Ticket1589

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-24 17:36:00 +02:00
Steve Lhomme c9edbe4af9 use a wrapper script to call MS link.exe to avoid mixing with /usr/bin/link.exe 
Fallback to "link" in the path if the one next to cl is not found.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-07-24 18:21:22 +03:00
Paul B Mahol 3cb8eee6f7 swscale: ayuv64le output support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-07-24 03:45:48 +00:00
Paul B Mahol 052f64ecb2 swscale: ayuv64le input support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-07-24 03:44:58 +00:00
Paul B Mahol f0489a35c0 avutil: add ayuv64le and ayuv64be packed pixel format 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-07-24 03:40:36 +00:00
Paul B Mahol 44fb00866f avfilter: rename vf_reverse.c to f_reverse.c 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-07-24 02:09:53 +00:00
Paul B Mahol 591741b51d avfilter: add areverse filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-07-24 02:06:48 +00:00
Ivan Uskov 0b159e3b65 libavcodec/qsvdec_h264.c: packet buffering has been removed since qsvdec.c does maintain own data buffering now. 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-24 13:03:42 +02:00
Ivan Uskov c90dbc67ed libavcodec/qsvdec.c: The ff_qsv_decode() now guarantees the consumption of whole packet. 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-24 12:46:55 +02:00
Michael Niedermayer 5da90d7ec3 avcodec/hapdec: Check that there is sufficient input data 
Fixes Ticket4729

Found-by: ami_stuff
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-24 04:40:15 +02:00
Michael Niedermayer da8b70b810 Merge commit 'a54e720e0289433d6bc3f7ba0a37fa5cabfaeea9' 
* commit 'a54e720e0289433d6bc3f7ba0a37fa5cabfaeea9':
  configure: force -nologo- when detecting MSVC

Conflicts:
	configure

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-24 00:44:58 +02:00
Michael Niedermayer c6965f62a2 Merge commit '44f7df0c987965763c609f6dc36974b04182e58d' 
* commit '44f7df0c987965763c609f6dc36974b04182e58d':
  dds: Write the palette in the native endian form

Conflicts:
	libavcodec/dds.c

See: 36a87c2dc7
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-23 21:30:28 +02:00
Steve Lhomme a54e720e02 configure: force -nologo- when detecting MSVC 
The -nologo- option is the inverse of -nologo, reenabling printing the
"logo" version header. This is useful if the compiler actually is a
wrapper that forces -nologo.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-07-23 22:28:08 +03:00
Tom Butterworth 64539e1213 avcodec/hap: (trivial) rename enum values and document their meaning 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-23 20:59:57 +02:00