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

3474 Commits

Author SHA1 Message Date
Michael Niedermayer b4f5da2651 avutil/buffer: factor buffer_replace() out 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-23 04:45:05 +01:00
Michael Niedermayer ec9935b288 avutil/pixfmt: Support the AV_PIX_FMT_GBRAP* formats with AV_HAVE_INCOMPATIBLE_LIBAV_ABI 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-15 17:09:39 +01:00
Michael Niedermayer 46b0fce627 avutil/pixfmt: Document the duplicated AV_PIX_FMT_GBRAP* formats 
This is similar to the other duplicated cases

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-15 17:09:39 +01:00
Michael Niedermayer ada0fc4efa Merge commit '0e6c7dfa650e8b0497bfa7a06394b7a462ddc33a' 
* commit '0e6c7dfa650e8b0497bfa7a06394b7a462ddc33a':
  lavu: add planar 16 bit and 8 bit rgb with alpha

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

See: e6d4e68755
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-15 05:24:01 +01:00
Michael Niedermayer 55dc253c24 Merge commit 'e2ad0b66fa273c5c823978e8f601f2c0d9ee42f8' 
* commit 'e2ad0b66fa273c5c823978e8f601f2c0d9ee42f8':
  imgutils: create misc functions for dealing with buffers

Conflicts:
	doc/APIchanges
	libavcodec/avcodec.h
	libavcodec/avpicture.c
	libavutil/imgutils.c
	libavutil/imgutils.h
	libavutil/version.h

See: e6674e46ec
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-15 05:07:25 +01:00
Paul B Mahol 0e6c7dfa65 lavu: add planar 16 bit and 8 bit rgb with alpha 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-01-14 17:17:24 +01:00
Stefano Sabatini e2ad0b66fa imgutils: create misc functions for dealing with buffers 
Move the lavc/imgconvert functions and rename them as follows:
  avpicture_get_size -> av_image_get_buffer_size()
  avpicture_fill     -> av_image_fill_arrays()
  avpicture_layout   -> av_image_copy_to_buffer()

The new functions have an align parameter, which allows to define the
linesize alignment assumed in the buffer (which is set or read).

The names of the functions are consistent with the lavu/samples API
(av_samples_get_buffer_size(), av_samples_fill_arrays()).

A redundant check has been dropped from av_image_fill_arrays().

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-01-14 17:17:24 +01:00
James Almer 3aaff80348 avutil/opencl: don't include config.h 
It's not an installed header.

Tested-by: Thilo Borgmann <thilo.borgmann@mail.de>
Tested-by: Wei Gao <highgod0401@gmail.com>
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-01-12 13:49:56 -03:00
Michael Niedermayer b20e79dbe9 Merge commit '07a0c0f0005072d115ace61e60f46be68582cc3a' 
* commit '07a0c0f0005072d115ace61e60f46be68582cc3a':
  opt: check memory allocation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-06 21:37:48 +01:00
Vittorio Giovara 07a0c0f000 opt: check memory allocation 
CC: libav-stable@libav.org
Bug-Id: CID 1257771
 2015-01-05 14:58:20 +01:00
Michael Niedermayer 0f931b29f7 Factorize avpriv_mirror() out 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-05 01:45:49 +01:00
Giorgio Vazzana a3ab87427c avutil/camellia: cosmetic fixes 
Signed-off-by: Giorgio Vazzana <mywing81@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-02 21:24:02 +01:00
Giorgio Vazzana fbb792f90f avutil/camellia: use K[2] instead of *K in generate_round_keys() 
Additionally, change parameters order.

Signed-off-by: Giorgio Vazzana <mywing81@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-02 21:23:56 +01:00
Giorgio Vazzana 8e38b1539e avutil/camellia: make LR128() more robust 
Signed-off-by: Giorgio Vazzana <mywing81@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-02 21:23:50 +01:00
Giorgio Vazzana 88d19d240a avutil/camellia: fix documentation for av_camellia_crypt() 
Signed-off-by: Giorgio Vazzana <mywing81@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-02 21:23:45 +01:00
Supraja Meedinti c6bb651bce libavutil: Added Camellia symmetric block cipher 
Signed-off-by: Supraja Meedinti <supraja0493@gmail.com>
Previous version of this patch reviewed-by: Giorgio Vazzana <mywing81@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-02 15:19:36 +01:00
James Almer 37b35feb64 x86/swr: add SSE2/AVX pack_8ch functions 
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
 2014-12-30 23:05:27 -03:00
Michael Niedermayer 827af24230 avutil/rational: Check that av_reduce() returns values within the requested max 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-29 15:52:34 +01:00
Clément Bœsch 56e432b27b avutil/atomic: reuse ret to avoid dereferencing twice the same value. 2014-12-27 22:14:23 +01:00
Michael Niedermayer 05e74ac2f3 avutil/hmac: use av_freep() to avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-27 15:50:01 +01:00
Michael Niedermayer 6d639ecf44 avutil/audio_fifo: use av_freep() to avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-27 15:49:13 +01:00
Michael Niedermayer 336bb3f706 avutil/dict: Use av_freep() to avoid leaving stale pointers in memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-27 15:48:32 +01:00
Michael Niedermayer 649c158e8c Add FFMPEG_VERSION into the binary libs 
This simplifies identifying from which revision a binary of a lib came from

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-19 19:32:40 +01:00
Supraja Meedinti 4e1ecfe214 libavutil: Added cbc mode to cast128 
Signed-off-by: Supraja Meedinti <supraja0493@gmail.com>
Previous version reviewed-by: Giorgio Vazzana <mywing81@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-19 14:35:29 +01:00
Michael Niedermayer 988d27b802 Merge commit 'b1306823d0b3ae998c8e10ad832004eb13bdd93e' 
* commit 'b1306823d0b3ae998c8e10ad832004eb13bdd93e':
  check memory errors from av_strdup()

Conflicts:
	avprobe.c
	libavformat/matroskaenc.c
	libavutil/opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-19 04:57:25 +01:00
Michael Niedermayer bce06eb059 Merge commit '5d839778b9f3edb682b7f71dde4f80f07c75b098' 
* commit '5d839778b9f3edb682b7f71dde4f80f07c75b098':
  lavu: Refactor side data wiping

Conflicts:
	libavutil/frame.c

See: a400edbb6d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-19 03:57:59 +01:00
Vittorio Giovara b1306823d0 check memory errors from av_strdup() 2014-12-18 23:27:14 +01:00
Luca Barbato 5d839778b9 lavu: Refactor side data wiping 
And make sure the nb_side_data field is reset as well.

Based on an initial patch from wm4 <nfxjfg@googlemail.com>.

CC: libav-stable@libav.org
 2014-12-18 23:22:59 +01:00
Supraja Meedinti abbcc68e5c libavutil: cosmetic: inserted spaces wherever necessary 
Signed-off-by: Supraja Meedinti <supraja0493@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-17 02:18:02 +01:00
wm4 a400edbb6d lavu/frame: fix malloc error path in av_frame_copy_props() 
The error path frees all side data, but forgets to reset the side data
count. This can blow up later in av_frame_unref() and free_side_data().

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-15 04:46:30 +01:00
Anton Khirnov e10e6651b5 thread: use "" instead of <> for including the w32pthreads wrapper 
Found-by: Dave Yeo <dave.r.yeo@gmail.com>
 2014-12-14 18:15:57 +01:00
wm4 a963fdb0ea lavu/dict: check for malloc failures 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-12 23:40:50 +01:00
Michael Niedermayer 92d47e2aa3 Merge commit '780cd20b00a69e26bbfffbb8eec16fbe999ea793' 
* commit '780cd20b00a69e26bbfffbb8eec16fbe999ea793':
  aarch64: Use .data.rel.ro for const data with relocations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-09 12:08:29 +01:00
Michael Niedermayer 16e65419ed Merge commit 'f963f80399deb1a2b44c1bac3af7123e8a0c9e46' 
* commit 'f963f80399deb1a2b44c1bac3af7123e8a0c9e46':
  arm: Use .data.rel.ro for const data with relocations

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-09 11:58:13 +01:00
Martin Storsjö 780cd20b00 aarch64: Use .data.rel.ro for const data with relocations 
This reverts commit c00365b46d
in addition to using a different section.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-12-09 11:43:31 +02:00
Martin Storsjö f963f80399 arm: Use .data.rel.ro for const data with relocations 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-12-09 11:43:25 +02:00
Michael Niedermayer 41a52740d4 avutil/opt: Fix AV_OPT_TYPE_BINARY case in av_opt_is_set_to_default() 
Fixes CID1257010

Reviewed-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-08 15:39:17 +01:00
Michael Niedermayer ace9161655 avutil/opt: Check av_parse_video_rate()s return value 
Fixes CID1257008

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-07 02:57:39 +01:00
Michael Niedermayer eb74839caa avutil/opt: Check av_parse_color() return value 
Fixes: CID1257007

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-07 02:46:25 +01:00
Michael Niedermayer 890d8f44fd avutil/buffer: add #if USE_ATOMICS around atomics specific functions to ensure sync types arent mixed by mistake 
Fixes CID1257011

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-06 20:47:41 +01:00
Kieran Kunhya 9a738c27dc v210enc: Add SIMD optimised 8-bit and 10-bit encoders 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-12-05 13:03:49 +00:00
Michael Niedermayer 5bf4cd8e5b avutil/ppc/util_altivec: add () to VEC_SPLAT16 macro 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-29 13:40:33 +01:00
Michael Niedermayer c299b6fd08 avutil/buffer: Move USE_ATOMICS to thread.h to avoid it becoming out of sync with it 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-29 12:26:22 +01:00
Dave Yeo 32eadfe453 libavutil/threads.h: correct an include to be local 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-29 11:56:28 +01:00
Dave Yeo 090a7801a8 libavutil/thread.h: Support OS/2 threads 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-29 11:56:22 +01:00
Vadim Kalinsky 2db29482f1 avutil/bprint: C++ compatible AVBPrint definition. 
Previous version reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-29 03:51:35 +01:00
Lukasz Marek 0cb994dfe3 lavu/opt: add escaping to av_opt_serialize 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-11-29 00:58:42 +01:00
Michael Niedermayer 6db8cd8f37 Merge commit 'fbd6c97f9ca858140df16dd07200ea0d4bdc1a83' 
* commit 'fbd6c97f9ca858140df16dd07200ea0d4bdc1a83':
  lavu: fix memory leaks by using a mutex instead of atomics

Conflicts:
	libavutil/buffer.c

The atomics code is left in place as a fallback for synchronization in the
absence of p/w32 threads. Our ABI did not requires applications to
only use threads (and matching ones) to what libavutil was build with
Our code also was not affected by the leak this change fixes, though
no question the atomics based implementation is not pretty at all.
First and foremost the code must work, being pretty comes after that.

If this causes problems, for example when libavutil is used by multiple
applications each using a different kind of threading system then the
default possibly has to be changed to the uglier atomics.

See: cea3a63ba3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-27 23:42:16 +01:00
Lukasz Marek f00e9c4b10 lavu/opt: add consts where possible 2014-11-27 23:27:14 +01:00
Michael Niedermayer 4760278007 Merge commit '2443e522f0059176ff8717c9c753eb6fe7e7bbf1' 
* commit '2443e522f0059176ff8717c9c753eb6fe7e7bbf1':
  lavu: add wrappers for the pthreads mutex API

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-27 22:08:17 +01:00