RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
78,349 Commits 36 Branches 392 Tags 311 MiB
Commit Graph

78349 Commits

Author SHA1 Message Date
Marton Balint 98e94dff7a configure: use -ldl for decklink 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-01-29 01:41:54 +01:00
Marton Balint cfc040a49f lavf: bump micro version after the new segment muxer options 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-01-29 01:41:09 +01:00
Marton Balint 369a6a6ed4 lavf/segment: add new option segment_clocktime_wrap_duration 
This option can force the segmenter to only start a new segment if a packet
reaches the muxer within the specified duration after the segmenting clock
time, which makes it more resilient to backward local time jumps, such as leap
seconds or transition to standard time from daylight savings time.

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-01-28 21:35:44 +01:00
Marton Balint 1036a1b8a3 lavf/segment: add support for specifying clock time offset 
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-01-28 21:35:37 +01:00
Vittorio Giovara b340bd8a58 libx264: Make sure to preserve default option values 
The private options chromaoffset, sc_threshold, and noise_reduction
were set to 0 rather than -1, and were always initializing values
in libx264 rather than letting the library use its default.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-28 18:45:40 +01:00
Michael Niedermayer cb06be6136 avcodec/libx264: Fix sc_threshold after 30c1bdb87c 
After the merge the default threshold was unconditionally overwritten

A similar fix was written by Vittorio Giovara, but i didnt see that before
i wrote this and it also doesnt apply cleanly

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-28 18:25:56 +01:00
Derek Buitenhuis 1a2d6055be avcodec/frame_thread_encoder: Check the private option for huffy's context modelling 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-28 17:19:06 +00:00
Derek Buitenhuis 5b0d4c247a Merge commit '96c373c7704aeb1cc1d2c275fbb5d71777665589' 
* commit '96c373c7704aeb1cc1d2c275fbb5d71777665589':
  lavc: Move context_model to codec private options

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-28 16:57:04 +00:00
Derek Buitenhuis 0e3e3656d3 Merge commit '12b49769223234673db1003d9c43e7483ceb0282' 
* commit '12b49769223234673db1003d9c43e7483ceb0282':
  lavc: Move mpeg_quant to codec private options

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-28 16:44:59 +00:00
Derek Buitenhuis b986a4625d Merge commit '1482aff2048511b821ff9feac19426113cc641a2' 
* commit '1482aff2048511b821ff9feac19426113cc641a2':
  lavc: Move noise_reduction to codec private options

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-28 16:42:32 +00:00
James Almer c792528970 x86/imdct36: use extractps inside the STORE macro 
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Reviewed-by: Henrik Gramner <henrik@gramner.com>
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-01-28 13:35:15 -03:00
wm4 14a90c9ef0 mmaldec: limit internal buffering 
This uses a new MMAL feature, which limits the number of extra frames
that can be buffered within the decoder. VIDEO_MAX_NUM_CALLBACKS can
be defined as positive or negative number. Positive numbers are
absolute, and can lead to deadlocks if the user underestimates the
number of required buffers. Negative numbers specify the number of extra
buffers, e.g. -1 means no extra buffer, (-1-N) means N extra buffers.

Set a gratuitous default of -11 (N=10). This is much lower than the
firmware default, which appears to be 96.

This is backwards compatible, but needs a symbol only present in newer
firmware headers. (It's an enum item, so it requires a check in
configure.)
 2016-01-28 17:24:53 +01:00
wm4 7b1b53f3a4 mmaldec: support MPEG-4 
I guess this means part 2 in both cases. Not sure which profiles exactly
are actually supported properly.
 2016-01-28 17:24:40 +01:00
wm4 d27a12cb09 mmaldec: print the MMAL format FourCC automatically 
Slight simplification. The result is the same. Also, change the
wording of the message as requested in patch review.
 2016-01-28 17:23:46 +01:00
wm4 0badf4564a configure: fix mmal build dependencies 
The mmal decoders do not depend on the software decoders.
 2016-01-28 17:23:23 +01:00
Derek Buitenhuis e8c5d5f429 snow: Move scenechange_threshold to a private option 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-28 15:36:06 +00:00
Derek Buitenhuis 30c1bdb87c Merge commit '7c79587d7407dab4b9445d66b5f111fe657c8c4d' 
* commit '7c79587d7407dab4b9445d66b5f111fe657c8c4d':
  lavc: Move scenechange_threshold to codec private options

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-28 15:24:00 +00:00
Derek Buitenhuis 7c6e86c0ce Merge commit '5764d38173661c29d954711dd5abfddf709e9ba4' 
* commit '5764d38173661c29d954711dd5abfddf709e9ba4':
  lavc: Move chromaoffset to codec private options

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-28 15:22:19 +00:00
Derek Buitenhuis 13be46c08e Merge commit '0ac9f33a9e69c64eee592791be3c5441a6a3d6b7' 
* commit '0ac9f33a9e69c64eee592791be3c5441a6a3d6b7':
  lavc: Move frame_skip_* to codec private options

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-28 15:08:10 +00:00
Derek Buitenhuis 4f32ccb618 Merge commit '84c4714f397c9c50eb9d49008cc1c08385f68f31' 
* commit '84c4714f397c9c50eb9d49008cc1c08385f68f31':
  lavc: Move brd_scale to codec private options

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-28 14:21:33 +00:00
Paul B Mahol 2edd47582b avcodec: add dvaudio parser 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-01-28 10:31:41 +01:00
Matthieu Bouron 27f1ea5097 lavc/mjpegdec: use ptrdiff_t instead of ssize_t 
Fixes build on msvc.
 2016-01-28 09:25:59 +01:00
Michael Niedermayer e0b187e7da avcodec/h264: Fix memleak in case of ff_h264_decode_extradata() failure 
Fixes Ticket5139

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-28 04:15:18 +01:00
Derek Buitenhuis 02bd02da5f qsvenc: Fix b_strategy typo 
This was introduced in 0e6c853221.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-28 00:08:40 +00:00
Rostislav Pehlivanov 925f145ace FATE: update AAC encoder PNS test target 
Test target hasn't been updated with the latest changes.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
 2016-01-27 23:55:24 +00:00
Derek Buitenhuis 265ed6732f libavcodec/util: Fix timebase overflow check 
It could accidentally divide by zero if num was zero.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-27 21:12:04 +00:00
James Almer 09d5c28c3d configure: fix openssl pkg-config check 
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-01-27 17:56:35 -03:00
Derek Buitenhuis cefad29df9 configure: Revert recent changes to disable-everything 
These will be re-merged once it's been fixed properly.

This reverts:
 * Commit '8e7bea6dc6ac5b21484774a026847bec0771ab62'
   configure: Improve requesting specific features
 * Commit 'e93aa2c9e7b3599aee6a5820760fc1a2c629dea0'
   configure: Force-enable select_any dependencies only on --enable

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-27 20:32:12 +00:00
Derek Buitenhuis 5889bc16a4 avcodec/version: Add missing #endif 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-27 20:27:25 +00:00
Derek Buitenhuis 2e9b995e4f Merge commit '0e6c8532215790bbe560a9eea4f3cc82bb55cf92' 
* commit '0e6c8532215790bbe560a9eea4f3cc82bb55cf92'
  lavc: Move b_frame_strategy and b_sensitivity to codec private options

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-27 20:18:04 +00:00
Derek Buitenhuis 11e6f13a13 Merge commit '55c7e5bf7c8d368c9bc60a219b04849ec9f4c84c' 
This is a NOOP.

* commit '55c7e5bf7c8d368c9bc60a219b04849ec9f4c84c':
  riff: add C210 FourCC (Canopus C210)
  riff: add YUYV FourCC (Drastic YUYV)

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-27 20:09:11 +00:00
Derek Buitenhuis e15e108885 Merge commit 'd43a165bda0eae95f4c7a168c7d13d94966c1a09' 
* commit 'd43a165bda0eae95f4c7a168c7d13d94966c1a09':
  imgconvert: Add the proper API guards to a deprecated function

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-27 20:06:01 +00:00
Derek Buitenhuis fa6c7ccc20 Merge commit 'f7168d7016f7d1034ec90223fa91a90711704e11' 
* commit 'f7168d7016f7d1034ec90223fa91a90711704e11':
  imgconvert: Move AVPicture-related static function to the deprecated section

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-27 20:02:01 +00:00
Derek Buitenhuis fa48cd8814 Merge commit '892f037c55d86ce36f8705fbeab052189312a13e' 
* commit '892f037c55d86ce36f8705fbeab052189312a13e':
  imgconvert: Move the shrink functions only where needed

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-27 19:58:35 +00:00
Derek Buitenhuis 54f49bd378 Merge commit '9d3ea5cbf57e30bf2717a9ce64e858dad8a02aa6' 
* commit '9d3ea5cbf57e30bf2717a9ce64e858dad8a02aa6':
  imgconvert: Drop outdated comment block

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-27 19:56:44 +00:00
Derek Buitenhuis 3662e55943 Merge commit 'e93aa2c9e7b3599aee6a5820760fc1a2c629dea0' 
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-27 19:52:48 +00:00
Derek Buitenhuis 97d5742434 Merge commit '65d29dd274a302131e2e4bc6d2b1eca4a093900c' 
This is a NOOP.

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-27 19:52:28 +00:00
Derek Buitenhuis b3702b6b66 Merge commit '883ad2c59ceea1ced5495b5ccc83695ed4bbb94b' 
This is a NOOP.

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-27 19:49:16 +00:00
Derek Buitenhuis 3de3937ecd Merge commit '8e7bea6dc6ac5b21484774a026847bec0771ab62' 
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-27 19:48:09 +00:00
Derek Buitenhuis fafb18d146 Merge commit 'e9175634ec96e36873929637491189150cfce9ec' 
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-27 19:41:36 +00:00
Derek Buitenhuis 7daad5c441 Merge commit '472d488ebcc53bea4cdb124edb94558e72d8f23f' 
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-27 19:40:50 +00:00
Derek Buitenhuis e87ace6246 Merge commit '7486418683bd2477772e03aab573cf846c12fb0d' 
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-27 19:39:52 +00:00
Derek Buitenhuis f97d2d2105 Merge commit 'e59708bb9d94f67381f19344b5e021591eb711bf' 
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-27 19:33:32 +00:00
Derek Buitenhuis ba7d16a303 Merge commit 'c4de754d4dac5ddae4d5a6f02798c0f560771921' 
This is a NOOP.

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-27 19:32:39 +00:00
Derek Buitenhuis bd7da0ae7b Merge commit '8fd361f53b3c17c1ae13a39e030c8fa3ab4d8f1f' 
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-27 19:30:08 +00:00
Matthieu Bouron 0d733ec379 lavc/mjpegdec: speed up scan data copy 2016-01-27 20:08:52 +01:00
Derek Buitenhuis e5b5676c00 Merge commit 'e4eb13ca77624401ea7cef1ed6ad8e2d13fd2063' 
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-27 18:32:28 +00:00
Derek Buitenhuis 949d6dd51c Merge commit '09f4822e4eaf61513b9092414450f3ae920ccd9d' 
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-27 18:29:21 +00:00
Derek Buitenhuis d97a6193c3 Merge commit '03ef89faf23c4851848208c9fe004cd9ef690cec' 
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-27 18:27:19 +00:00
Derek Buitenhuis ea2df33052 Merge commit '4f22b138886e29f7fffa8c715673951e51be9f32' 
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-27 18:23:31 +00:00