ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-21 22:06:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
78,165 Commits 36 Branches 398 Tags 535 MiB
d27a12cb09
Commit Graph

78165 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Derek Buitenhuis
66eb8ce473 Merge commit 'b06cb15b9d7928bf54b639c9f9f7658c2c38bfb9' 
One big NOOP.

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-27 18:21:20 +00:00
Derek Buitenhuis
42f0ed67a3 Merge commit 'c59fec783d6540dd96540b079d753ee4a6ad2e58' 
This is a NOOP.

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-27 17:45:50 +00:00
Derek Buitenhuis
a54422fff2 Merge commit '39571e86cb0d55536f649210a025c54e440c632b' 
This is a NOOP.

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-27 17:20:21 +00:00
Derek Buitenhuis
257766a838 Merge commit '9cce011b1d2f66366f5d75a024c2a2f93dc2b589' 
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-27 16:57:24 +00:00
Derek Buitenhuis
895b888f16 Merge commit '521dc78366c6ea54b7b69426dab302a57231f81e' 
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-27 16:56:22 +00:00
Derek Buitenhuis
e5fe75ae2b Merge commit 'fa66237b69c27befa788b100e73783e0f47fe1b7' 
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-27 16:54:57 +00:00
Derek Buitenhuis
71b79b587b Merge commit '62825236dba31a2240e25974a3ba41c1303e4edc' 
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-27 16:53:23 +00:00
Derek Buitenhuis
9f18be42f0 Merge commit '81737f42c28858dad76a40284a35f7a64faa2fc7' 
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-27 16:51:06 +00:00
Derek Buitenhuis
711dae575d Merge commit '46350db737a15910f468d30cf7beda16a4cc8332' 
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-27 16:47:46 +00:00
Derek Buitenhuis
dbbfbde085 Merge commit 'e8bc642202c10beda1ea4e93ec8492b1e39805e5' 
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-27 16:46:58 +00:00
Derek Buitenhuis
21f9468402 avutil: Rename FF_CEIL_COMPAT to AV_CEIL_COMPAT 
Libav, for some reason, merged this as a public API function. This will
aid in future merges.

A define is left for backwards compat, just in case some person
used it, since it is in a public header.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-01-27 16:36:46 +00:00
Michael Niedermayer
0aada30510 avcodec/jpeg2000dec: More completely check cdef 
Fixes out of array read
Fixes: j2k-poc.bin

Found-by: Lucas Leong <wmliang.tw@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-27 17:18:00 +01:00
Paul B Mahol
75a7565bcb avcodec/dvaudiodec: support cases when codec_tag is not set but block_align is 
Support packets larger than block size, return single block size.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-01-27 13:58:25 +01:00