virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
52,065 Commits 37 Branches 400 Tags 460 MiB
76c8060654
Commit Graph

2515 Commits

Author SHA1 Message Date
Nicolas George
76c8060654 lavu: add av_pure to av_int_list_length_for_size. 2013-04-13 20:19:24 +02:00
highgod0401
8f99494c1c avutil/opencl: merge opencl env to opencl context 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-12 23:54:40 +02:00
Nicolas George
af0d270aac lavu: add helper functions for integer lists. 
Add av_int_list_length() to compute a list length.
Add av_opt_set_int_list() to set a binary option.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-12 12:09:51 +02:00
Michael Niedermayer
b2175b0f2a Merge commit '93e65e9a6c0895f869752a66731d9b2ec3916467' 
* commit '93e65e9a6c0895f869752a66731d9b2ec3916467':
  Cosmetics, restore alphabetic order in atomics lists.

Conflicts:
	libavutil/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-11 22:22:06 +02:00
highgod0401
9d442b9cc0 opencl: add spec opencl device APIs 20130411 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-11 12:46:34 +02:00
Anton Khirnov
93e65e9a6c Cosmetics, restore alphabetic order in atomics lists. 2013-04-11 12:31:14 +02:00
highgod0401
db2de94e95 avutil/opencl: add opencl device list APIs 20130411 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-11 03:48:57 +02:00
Stefano Sabatini
8afcaaeb75 lavu/eval: rename "new_eval_expr()" to "make_eval_expr()" 
The new name is more semantically and stilistically consistent.
 2013-04-10 13:11:27 +02:00
Ronald S. Bultje
b93b27edb0 dsputil: Make dsputil selectable 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-04-10 11:04:05 +03:00
Christophe Gisquet
2e81acc687 x86inc: Fix number of operands for cmp* instructions 
cmp{p,s}{s,d} instructions do take an imm8 operand.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-04-09 23:55:30 +02:00
highgod0401
99186f1fd2 fix bug of finding CPU device 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-05 20:47:21 +02:00
Christophe Gisquet
0b467a6e83 x264asm: fix cmp* number of arguments 
cmp{p,s}{s,d} instructions do take an imm8 operand.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-05 16:42:12 +02:00
Michael Niedermayer
8e85b69d71 Merge commit '8c65264595d5a82c56ae5043320e4b875a414229' 
* commit '8c65264595d5a82c56ae5043320e4b875a414229':
  pixdesc/pixfmt: Add XYZ colorspace for XYZ 12-bit values
  img2: Add j2k file extension for JPEG 2000

Conflicts:
	libavutil/pixfmt.h
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-05 12:39:06 +02:00
Nicolas Bertrand
8c65264595 pixdesc/pixfmt: Add XYZ colorspace for XYZ 12-bit values 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-04-04 19:50:59 +02:00
highgod0401
cfaffb1ab7 avutil/opencl: replace assert by check and error message in av_opencl_init() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-04 19:27:45 +02:00
highgod0401
322428c851 avutil/opencl: check strtol for failure 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-04 19:26:16 +02:00
highgod0401
39406ea321 avutil/opencl: add check for the program number to create kernel 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-04 19:25:22 +02:00
Michael Niedermayer
e7389ed5d0 Merge commit 'bcc94328980e6c56546792ab08b0756abdce310b' 
* commit 'bcc94328980e6c56546792ab08b0756abdce310b':
  opt: check the return values of av_get_token for ENOMEM.
  doc: Fix best_nb_channells typo
  matroska: pass the lace size to the matroska_parse_rm_audio

Conflicts:
	libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-04 13:00:59 +02:00
Anton Khirnov
bcc9432898 opt: check the return values of av_get_token for ENOMEM. 2013-04-04 07:51:53 +02:00
Carl Eugen Hoyos
c484b3af15 Fix make checkheaders without opencl headers. 2013-04-03 15:28:29 +02:00
Michael Niedermayer
6ce1d87355 Merge commit 'f9f6402e9c9ce3642df981b48507df3a2d956f65' 
* commit 'f9f6402e9c9ce3642df981b48507df3a2d956f65':
  configure: prettify atomics handling.

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-03 14:46:48 +02:00
Anton Khirnov
f9f6402e9c configure: prettify atomics handling. 
Add simpler names and a shorthand for native atomics (as opposed to
pthreads fallback).
 2013-04-03 09:22:31 +02:00
Stefano Sabatini
064acc9743 lavu/opencl: use consistent inclusion header guard name 2013-04-01 23:54:29 +02:00
Stefano Sabatini
57d77b3963 lavu/opencl: apply misc cosmetics fixes 
Split long lines, reindent code, add missing spaces between operators,
remove possibly confusing comment from av_opencl_buffer_read_image()
doxy, and use designated initializers for openclutils_class.
 2013-04-01 23:54:21 +02:00
Michael Niedermayer
599866f5d5 Merge remote-tracking branch 'cigaes/master' 
* cigaes/master:
  lavfi/af_asetnsamples: fix EOF handling.
  lavu/opt: make sure av_opt_set_bin() handles NULL/0.
  lavd/v4l2: fully init an ioctl argument.
  lavfi: detect merge failure for unknown layouts.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-01 15:13:07 +02:00
Michael Niedermayer
76071322a3 opencl: fix double ; 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-01 13:01:17 +02:00
highgod0401
189cbc1a03 opencl wrapper based on comments on 20130401 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-01 12:52:13 +02:00
Nicolas George
983d04dd40 lavu/opt: make sure av_opt_set_bin() handles NULL/0. 2013-04-01 10:38:38 +02:00
Clément Bœsch
d00dcb8c9f opt: attempt to improve options dump output. 
Add some indent and remove the '-' prefix for filters.
 2013-03-31 18:22:23 +02:00
Stefano Sabatini
5c73645d91 lavu/samplefmt: add av_samples_alloc_array_and_pointers() 2013-03-31 18:00:44 +02:00
Michael Niedermayer
dc92464aee avutil: add av_buffer_get_ref_count() 
This function is quite usefull for debuging

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-30 20:28:00 +01:00
Xidorn Quan
c81d2fa96d avutil/buffer: add get_opaque 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-29 17:31:16 +01:00
Michael Niedermayer
fd37a7dc3c Merge commit 'cf53704c55378cc0dcfc16637cdac7d58f0b3107' 
* commit 'cf53704c55378cc0dcfc16637cdac7d58f0b3107':
  AVOptions: make av_set_options_string() forward options to child objects
  win32: Use 64-bit fstat/lseek variants for MSVC as well
  win32: Make ff_win32_open more robust

Conflicts:
	libavformat/os_support.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-28 12:26:36 +01:00
Michael Niedermayer
63a97d5674 Merge commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa' 
* commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa':
  cosmetics: Remove unnecessary extern keywords from function declarations

Conflicts:
	libswscale/x86/swscale.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-28 11:20:41 +01:00
Anton Khirnov
cf53704c55 AVOptions: make av_set_options_string() forward options to child objects 2013-03-28 07:55:38 +01:00
Diego Biurrun
b6649ab503 cosmetics: Remove unnecessary extern keywords from function declarations 2013-03-27 14:21:45 +01:00
Michael Niedermayer
8e944891ce avutil/buffer: remove redundant memory poisoning 
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-24 02:21:42 +01:00
Michael Niedermayer
058c002932 avutil/buffer: support memory poisoning 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-24 01:44:48 +01:00
Michael Bradshaw
2a97c5915b Make audio FIFO read/write contracts more strict 
Signed-off-by: Michael Bradshaw <mjbshaw@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-23 13:33:45 +01:00
Michael Niedermayer
6efe61486d Merge commit '1e8b9738fa70e20967ddb542d2f9d5552fc51ec6' 
* commit '1e8b9738fa70e20967ddb542d2f9d5552fc51ec6':
  avutil/frame: add all remaining frame properties to av_frame_copy_props

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-23 12:08:01 +01:00
Hendrik Leppkes
1e8b9738fa avutil/frame: add all remaining frame properties to av_frame_copy_props 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-03-22 20:05:37 +01:00
Clément Bœsch
77f60f0011 lavu/eval: add between() function. 2013-03-22 09:20:45 +01:00
Nicolas George
8d928a9d99 lavu/opt: add AV_OPT_TYPE_DURATION. 2013-03-20 21:04:28 +01:00
Michael Niedermayer
9ea6c14820 Merge remote-tracking branch 'cigaes/master' 
* cigaes/master:
  lavu/frame: use channels rather than channel_layout.
  lavf: avformat_seek_file(): validate stream_index.
  lavf/concatdec: fix possible leak in case of malloc failure.
  lavfi/buffersink: check av_frame_ref() failure.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-20 13:58:04 +01:00
Michael Niedermayer
b274703493 avutil/atomic: use av_assert0() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-20 13:45:30 +01:00
Michael Niedermayer
eaa5882e71 avutil: fix compilation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-20 13:45:30 +01:00
Nicolas George
a964d6a8a2 lavu/frame: use channels rather than channel_layout. 2013-03-20 13:35:24 +01:00
Paul B Mahol
7aa9af51db lavu/opt: add AV_OPT_VIDEO_RATE option 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-03-20 12:29:54 +00:00
Michael Niedermayer
17ebef2fc8 Merge commit '2c328a907978b61949fd20f7c991803174337855' 
* commit '2c328a907978b61949fd20f7c991803174337855':
  pixdesc: add a function for counting planes in a pixel format.
  avplay: remove the -debug option.
  Revert "asfenc: return error on negative timestamp"

Conflicts:
	doc/APIchanges
	doc/ffplay.texi
	ffplay.c
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-20 11:24:11 +01:00
Michael Niedermayer
f1c3d8b344 avutil/add_to_pool: remove unused assgnment 
Fixed CID991859
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-19 13:35:10 +01:00