RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
79,889 Commits 36 Branches 398 Tags 234 MiB
Commit Graph

2041 Commits

Author SHA1 Message Date
Derek Buitenhuis ca5ec2bf51 Merge commit '01621202aad7e27b2a05c71d9ad7a19dfcbe17ec' 
* commit '01621202aad7e27b2a05c71d9ad7a19dfcbe17ec':
  build: miscellaneous cosmetics

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-09 16:25:28 +01:00
Derek Buitenhuis f93c409c0b Merge commit '44f05f15d4a34ef2f0d62259e5d5b43371bc0954' 
* commit '44f05f15d4a34ef2f0d62259e5d5b43371bc0954':
  build: Do not check the vaapi_encode.h header if VAAPI is not enabled

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-08 22:53:50 +01:00
Derek Buitenhuis 939345854a Merge commit '83f230c2445a94fdd94c66504482217fcece5909' 
* commit '83f230c2445a94fdd94c66504482217fcece5909':
  lavc: VAAPI MJPEG encoder

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-08 22:46:52 +01:00
Derek Buitenhuis a82d1a8c7a Merge commit '31fe1f2577f8208f79a4b3ab59465e78dd497555' 
* commit '31fe1f2577f8208f79a4b3ab59465e78dd497555':
  lavc: VAAPI H.265 encoder

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-08 22:45:39 +01:00
Derek Buitenhuis b975aeec02 Merge commit '2c62fcdf5d617791a653d7957d449f75569eede0' 
* commit '2c62fcdf5d617791a653d7957d449f75569eede0':
  lavc: VAAPI H.264 encoder

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-08 22:43:52 +01:00
Derek Buitenhuis 508957fd0f Merge commit '104c804bcaac24b52eb51ed17df2fb311e6ae73e' 
* commit '104c804bcaac24b52eb51ed17df2fb311e6ae73e':
  lavc: VAAPI encode common infrastructure

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-08 22:41:12 +01:00
Hendrik Leppkes 772ad7142d Merge commit 'ca2f19b9cc37be509d85f05c8f902860475905f8' 
* commit 'ca2f19b9cc37be509d85f05c8f902860475905f8':
  h264: switch to h2645_parse for NAL parsing

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2016-05-07 21:13:44 +01:00
Michael Niedermayer 4155d5e06f avcodec: add M101 decoder 
Fixes Ticket 2611

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-05-06 15:36:24 +02:00
Derek Buitenhuis a454ad670c Merge commit 'add1467e5e447b79e8743a0b05c54dcf58c61dfe' 
* commit 'add1467e5e447b79e8743a0b05c54dcf58c61dfe':
  svq3: drop the build dependency on the h264 decoder

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-05-03 10:57:36 +01:00
foo86 2df7d4fa45 avcodec/dca: move huffman data into separate object file 
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-05-01 16:50:29 -03:00
Derek Buitenhuis a2922b5d61 Merge commit 'ecc31f6b086453ab9811dce2ae5ceb6a7c19e4ad' 
* commit 'ecc31f6b086453ab9811dce2ae5ceb6a7c19e4ad':
  h264: move ff_h264_check_intra[4x4]_pred_mode() to h264_parse

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-27 16:34:40 +01:00
Derek Buitenhuis ee38234c43 Merge commit 'e481458bc308ee838deaeacac51929514762e7a7' 
* commit 'e481458bc308ee838deaeacac51929514762e7a7':
  h264: factor out pred weight table parsing into a separate file

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-26 15:04:29 +01:00
Derek Buitenhuis 3c4ca4c5d7 Merge commit 'fa936a307f5cddfc2664600157a8207ca8080af6' 
* commit 'fa936a307f5cddfc2664600157a8207ca8080af6':
  hevc_parse: rename into h2645_parse

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-26 13:56:47 +01:00
Derek Buitenhuis 9809371aa5 Merge commit 'a7da517f6a5c472f46f67dd33bb6b95ccc919923' 
* commit 'a7da517f6a5c472f46f67dd33bb6b95ccc919923':
  h264data: Move all data tables from a header to a .c file

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-24 11:54:53 +01:00
Paul B Mahol c85d04251d avcodec: add TrueMotion 2.0 Real Time decoder 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-04-21 20:15:17 +02:00
Derek Buitenhuis af9cac1be1 Merge commit '33d18982fa03feb061c8f744a4f0a9175c1f63ab' 
* commit '33d18982fa03feb061c8f744a4f0a9175c1f63ab':
  lavc: add a new bitstream filtering API

Conversions-by: Hendrik Leppkes <h.leppkes@gmail.com>
Conversions-by: Derek Buitenguis <derek.buitenhuis@gmail.com>
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-17 18:47:40 +01:00
Rodger Combs b20d3bf4a4
lavc/audiotoolboxdec: avoid relying on consumer-provided params when possible 2016-04-13 03:27:29 -05:00
Diego Biurrun 01621202aa build: miscellaneous cosmetics 
Restore alphabetical order in lists, break overly long lines, do some
prettyprinting, add some explanatory section comments, group parts
together that belong together logically.
 2016-04-07 15:26:08 +02:00
Paul B Mahol 8a4c3f5258 avcodec: add adpcm dat4 decoder 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-04-05 10:48:59 +02:00
Rodger Combs b4daa2c40f lavc/audiotoolboxdec: add eac3 decoder 
This is added in 10.11, so we add a #define when building against older SDKs.

The decoder actually supports 7.1-channel eac3, but since the parser only
reports 6 channels, we end up decoding the 5.1 downmix (same as the internal
decoder) for now.
 2016-04-02 03:03:13 -05:00
Diego Biurrun 44f05f15d4 build: Do not check the vaapi_encode.h header if VAAPI is not enabled 2016-03-30 17:52:46 +02:00
Mark Thompson 83f230c244 lavc: VAAPI MJPEG encoder 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2016-03-30 09:11:44 +02:00
Mark Thompson 31fe1f2577 lavc: VAAPI H.265 encoder 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2016-03-30 09:11:25 +02:00
Mark Thompson 2c62fcdf5d lavc: VAAPI H.264 encoder 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2016-03-30 09:10:26 +02:00
Mark Thompson 104c804bca lavc: VAAPI encode common infrastructure 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2016-03-30 09:05:28 +02:00
Paul B Mahol ff982e02b5 avcodec: add dca core extraction bsf 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-03-28 10:50:41 +02:00
Anton Khirnov ca2f19b9cc h264: switch to h2645_parse for NAL parsing 2016-03-28 10:16:28 +02:00
Anton Khirnov add1467e5e svq3: drop the build dependency on the h264 decoder 2016-03-28 09:58:26 +02:00
Anton Khirnov ecc31f6b08 h264: move ff_h264_check_intra[4x4]_pred_mode() to h264_parse 
It is shared with svq3.
 2016-03-28 09:53:56 +02:00
Anton Khirnov e481458bc3 h264: factor out pred weight table parsing into a separate file 
This will allow decoupling the parser from the decoder.
 2016-03-28 09:48:31 +02:00
Anton Khirnov fa936a307f hevc_parse: rename into h2645_parse 
This code will be shared with h264.
 2016-03-28 09:42:44 +02:00
Kieran Kunhya e259dc86a8 avcodec: Remove libdcadec, we already have it merged internally 2016-03-27 04:21:38 +01:00
Diego Biurrun a7da517f6a h264data: Move all data tables from a header to a .c file 2016-03-25 15:56:14 +01:00
Rodger Combs 65cff81453 lavc: add AudioToolbox encoders 
Fixes trac #4828
 2016-03-22 12:43:14 -05:00
Rodger Combs d5d328059e lavc: add AudioToolbox decoders 
Part of trac #4828
 2016-03-22 12:43:14 -05:00
Anton Khirnov 33d18982fa lavc: add a new bitstream filtering API 
Deprecate the current bitstream filtering API.
 2016-03-20 08:15:01 +01:00
Reimar Döffinger 7c93f2c0b9 Move cbrt tables to separate cbrt_data(_fixed).c files. 
Allows sharing and reusing the data between different files.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2016-03-13 18:15:57 +01:00
Ronald S. Bultje 2e6636aa87 vp9: add superframe merging bitstream filter. 
Fixes ticket 4313.
 2016-03-11 11:19:14 -05:00
Matthieu Bouron 4737fe6907 lavc: add h264 mediacodec decoder 2016-03-07 11:28:29 +01:00
Matthieu Bouron 3ab178516e lavc: add JNI support 2016-03-07 11:17:31 +01:00
Rick Kern 3af71ac3f9 lavc: add VideoToolbox H.264 Encoder 
Autodetected by default. Encode using -codec:v h264_videotoolbox.

Signed-off-by: Rick Kern <kernrj@gmail.com>
Signed-off-by: wm4 <nfxjfg@googlemail.com>
 2016-03-02 21:19:35 +01:00
Michael Niedermayer 0be09f54fb avcodec: Add utils test 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-02-29 21:44:06 +01:00
Rodger Combs b426d66370 lavc/Makefile: dnxhd demuxer depends on dnxhddata.o 2016-02-27 16:26:18 -06:00
Clément Bœsch 805685fffd Kill timed SSA 2016-02-26 21:34:33 +01:00
Derek Buitenhuis ef7ce480c8 Merge commit 'd24bd96bdd5b4bae9a9e0055fa8d1104db1283a9' 
* commit 'd24bd96bdd5b4bae9a9e0055fa8d1104db1283a9':
  build: Disentangle VC-1 decoder and parser

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-24 18:23:36 +00:00
Derek Buitenhuis b056482ef3 Merge commit '15a24614aef5836af3cd2c7cc3b2b737eee6bf3c' 
* commit '15a24614aef5836af3cd2c7cc3b2b737eee6bf3c':
  build: Add vc1dsp component for more fine-grained dependencies

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-24 18:21:38 +00:00
Derek Buitenhuis 2814f06abf Merge commit 'f9fbd474676e903e12efe83203697d60a9d28cf9' 
* commit 'f9fbd474676e903e12efe83203697d60a9d28cf9':
  msmpeg4data: Move WMV2 data tables to their own file

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-24 18:15:14 +00:00
Derek Buitenhuis 745d0c0300 Merge commit '624e235502c5aa2d17e22dd6c0ccdf080a177310' 
* commit '624e235502c5aa2d17e22dd6c0ccdf080a177310':
  build: Introduce iso_media component

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-24 17:53:30 +00:00
Derek Buitenhuis 34e4c588c8 Merge commit '82454c3a826bc8aa42474097784b70befd5be532' 
* commit '82454c3a826bc8aa42474097784b70befd5be532':
  build: Let the WTV demuxer select the MPEG-TS demuxer
  build: Adjust mpeg4video parser dependencies
  build: Fix mpegvideo component dependencies
  build: Fix dependencies for components relying on H.263 data tables

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-24 17:46:10 +00:00
Derek Buitenhuis 3c5a040ad9 Merge commit 'e453129321778886813dcecf73c8b42f8352ca0e' 
* commit 'e453129321778886813dcecf73c8b42f8352ca0e':
  build: Add missing dependencies for eatqi decoder

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-24 17:39:04 +00:00