x/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-08-11 12:19:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,664 Commits 40 Branches 431 Tags
b5e5ed8ea707fefcab15dbfa3fa0dc2f36e5275a
Commit Graph
2425 Commits
Author SHA1 Message Date
Fabrizio Gennari 91b747ac78 mem: Fix usage of memalign() on DJGPP. 
Credits to Khusraw of bttr-software.de forum.
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
 2013-03-10 11:12:56 +01:00
Clément Bœsch e53061154f lavu/frame: fix not/note typo in doxy. 2013-03-10 02:07:34 +01:00
Michael Niedermayer a05a44e205 Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 
* commit '7e350379f87e7f74420b4813170fe808e2313911':
  lavfi: switch to AVFrame.

Conflicts:
	doc/filters.texi
	libavfilter/af_ashowinfo.c
	libavfilter/audio.c
	libavfilter/avfilter.c
	libavfilter/avfilter.h
	libavfilter/buffersink.c
	libavfilter/buffersrc.c
	libavfilter/buffersrc.h
	libavfilter/f_select.c
	libavfilter/f_setpts.c
	libavfilter/fifo.c
	libavfilter/split.c
	libavfilter/src_movie.c
	libavfilter/version.h
	libavfilter/vf_aspect.c
	libavfilter/vf_bbox.c
	libavfilter/vf_blackframe.c
	libavfilter/vf_delogo.c
	libavfilter/vf_drawbox.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_fade.c
	libavfilter/vf_fieldorder.c
	libavfilter/vf_fps.c
	libavfilter/vf_frei0r.c
	libavfilter/vf_gradfun.c
	libavfilter/vf_hqdn3d.c
	libavfilter/vf_lut.c
	libavfilter/vf_overlay.c
	libavfilter/vf_pad.c
	libavfilter/vf_scale.c
	libavfilter/vf_showinfo.c
	libavfilter/vf_transpose.c
	libavfilter/vf_vflip.c
	libavfilter/vf_yadif.c
	libavfilter/video.c
	libavfilter/vsrc_testsrc.c
	libavfilter/yadif.h

Following are notes about the merge authorship and various technical details.

Michael Niedermayer:
  * Main merge operation, notably avfilter.c and video.c
  * Switch to AVFrame:
    - afade
    - anullsrc
    - apad
    - aresample
    - blackframe
    - deshake
    - idet
    - il
    - mandelbrot
    - mptestsrc
    - noise
    - setfield
    - smartblur
    - tinterlace
  * various merge changes and fixes in:
    - ashowinfo
    - blackdetect
    - field
    - fps
    - select
    - testsrc
    - yadif

Nicolas George:
  * Switch to AVFrame:
    - make rawdec work with refcounted frames. Adapted from commit
      759001c534 by Anton Khirnov.
      Also, fix the use of || instead of | in a flags check.
    - make buffer sink and src, audio and video work all together

Clément Bœsch:
  * Switch to AVFrame:
    - aevalsrc
    - alphaextract
    - blend
    - cellauto
    - colormatrix
    - concat
    - earwax
    - ebur128
    - edgedetect
    - geq
    - histeq
    - histogram
    - hue
    - kerndeint
    - life
    - movie
    - mp (with the help of Michael)
    - overlay
    - pad
    - pan
    - pp
    - pp
    - removelogo
    - sendcmd
    - showspectrum
    - showwaves
    - silencedetect
    - stereo3d
    - subtitles
    - super2xsai
    - swapuv
    - thumbnail
    - tile

Hendrik Leppkes:
  * Switch to AVFrame:
    - aconvert
    - amerge
    - asetnsamples
    - atempo
    - biquads

Matthieu Bouron:
  * Switch to AVFrame
    - alphamerge
    - decimate
    - volumedetect

Stefano Sabatini:
  * Switch to AVFrame:
    - astreamsync
    - flite
    - framestep

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Clément Bœsch <ubitux@gmail.com>
Signed-off-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-10 01:40:35 +01:00
Clément Bœsch 586ae70ba7 port FFmpeg lavc frame specificities to lavu functions. 2013-03-10 01:25:02 +01:00
Nicolas George d1b456b0a8 lavu/frame: copy the channels field. 2013-03-10 01:25:02 +01:00
Martin Storsjö 309d6f5077 atomic: Add include guards to the implementation headers 
This makes them pass standalone compilation tests. Previously,
they included atomic.h which included themselves again, leading to
double definitions.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-03-08 20:54:40 +01:00
Michael Niedermayer 307dc32a1a Merge commit '77b2cd7b41d7ec8008b6fac753c04f77824c514c' 
* commit '77b2cd7b41d7ec8008b6fac753c04f77824c514c':
  AVFrame: add side data.

Conflicts:
	libavutil/frame.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-08 20:41:41 +01:00
Michael Niedermayer c4e8821732 Merge commit '7ecc2d403ce5c7b6ea3b1f368dccefd105209c7e' 
* commit '7ecc2d403ce5c7b6ea3b1f368dccefd105209c7e':
  Move AVFrame from lavc to lavu.

Conflicts:
	libavcodec/avcodec.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-08 20:33:26 +01:00
Michael Niedermayer fee484edaf Merge commit 'ad0c9f2d5d81e22207c6ccecc426bf7306acc327' 
* commit 'ad0c9f2d5d81e22207c6ccecc426bf7306acc327':
  lavc: move AVFrame.hwaccel_picture_private to Picture.

Conflicts:
	libavcodec/avcodec.h
	libavcodec/mpegvideo.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-08 19:35:37 +01:00
Michael Niedermayer 532f31a695 Merge commit '1cec0624d0e6f48590283a57169b58b9fe8449d3' 
* commit '1cec0624d0e6f48590283a57169b58b9fe8449d3':
  AVBuffer: add a new API for buffer pools

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-08 16:06:20 +01:00
Michael Niedermayer 36099df521 Merge commit '8e401dbe90cc77b1f3067a917d9fa48cefa3fcdb' 
* commit '8e401dbe90cc77b1f3067a917d9fa48cefa3fcdb':
  lavu: add a new API for reference-counted data buffers.

Conflicts:
	libavutil/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-08 16:01:00 +01:00
Michael Niedermayer e92ba51fd7 Merge commit '65f1d45dcc71186ede72fff950996099d23359bd' 
* commit '65f1d45dcc71186ede72fff950996099d23359bd':
  lavu: add support for atomic operations.

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-08 15:48:27 +01:00
Michael Niedermayer 1f3a577353 Merge commit '4be368b504c6f4a03051448728fc62cd0ed506b2' 
* commit '4be368b504c6f4a03051448728fc62cd0ed506b2':
  avstring: Fix isxdigit to not accept non-hex characters
  configure: Add missing videodsp dependencies to some decoders

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-08 15:37:21 +01:00
Michael Niedermayer 6c17ff84ad Merge commit 'efa7f4202088c70caba11d7834641bc6eaf41830' 
* commit 'efa7f4202088c70caba11d7834641bc6eaf41830':
  Use the avstring.h locale-independent character type functions
  avstring: Add locale independent versions of some ctype.h functions

Conflicts:
	avprobe.c
	doc/APIchanges
	libavcodec/dvdsubdec.c
	libavcodec/utils.c
	libavutil/avstring.c
	libavutil/avstring.h
	libavutil/eval.c
	libavutil/parseutils.c
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-08 14:57:41 +01:00
Anton Khirnov 77b2cd7b41 AVFrame: add side data. 2013-03-08 07:37:01 +01:00
Anton Khirnov 7ecc2d403c Move AVFrame from lavc to lavu. 
Add AVBuffer-based reference counting API to it.
 2013-03-08 07:36:15 +01:00
Anton Khirnov ad0c9f2d5d lavc: move AVFrame.hwaccel_picture_private to Picture. 
This field is private and should not be present in a public struct. It
is only used in DXVA with mpegvideo-based decoders currently.
 2013-03-08 07:36:01 +01:00
Anton Khirnov 1cec0624d0 AVBuffer: add a new API for buffer pools 2013-03-08 07:33:28 +01:00
Anton Khirnov 8e401dbe90 lavu: add a new API for reference-counted data buffers. 2013-03-08 07:33:03 +01:00
Ronald S. Bultje 65f1d45dcc lavu: add support for atomic operations. 
These could be used for reference counting, or for keeping track of
decoding progress in references in multithreaded decoders.

Support is provided by gcc/msvc/suncc intrinsics, with a fallback using
pthread mutexes.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-03-08 07:32:36 +01:00
Carl Eugen Hoyos de4811e910 Force using a 64bit intermediate when calculating calendar time with av_timegm(). 
Fixes a fate failure with icc 13.1
 2013-03-08 02:42:33 +01:00
Martin Storsjö 4be368b504 avstring: Fix isxdigit to not accept non-hex characters 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-03-07 16:46:46 +02:00
Reimar Döffinger efa7f42020 Use the avstring.h locale-independent character type functions 
Make sure the behavior does not change with the locale.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-03-07 15:16:36 +02:00
Reimar Döffinger 12c5c1d3e3 avstring: Add locale independent versions of some ctype.h functions 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-03-07 15:16:26 +02:00
Stefano Sabatini 9767ec6b86 lavu: add escape API 
The escape API will be useful to perform escaping programmatically, which
is required when crafting argument strings, and will be used for context
printing as well.

This is based on the ffescape tool code, with a few extensions and fixes.
 2013-03-07 01:12:04 +01:00
Stefano Sabatini ad48556135 lavu/eval: add native support to lte and lt functions 2013-03-05 15:15:45 +01:00
Stefano Sabatini b1a2684936 lavu/opt: fix weird align 2013-03-05 13:20:14 +01:00
Stefano Sabatini 7b9a3df5d7 lavu/opt-test: do not explicitly set default value in test_ctx 
Let av_opt_set_defaults() set the value, which is simpler and more
idiomatic.
 2013-03-05 13:20:14 +01:00
Reimar Döffinger 88d55b827d Remove incorrect use of ctype.h functions. 
As far as I can tell the code should not change behaviour
depending on locale in any of these places.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2013-03-03 21:44:10 +01:00
Michael Niedermayer 4b335e73da Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lls: Do not return from void functions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-01 13:50:19 +01:00
Michael Niedermayer 7da1b235e8 Merge commit '4da950c0ae224b9b8ef952dadf614be2c050023e' 
* commit '4da950c0ae224b9b8ef952dadf614be2c050023e':
  lls: #ifndef --> #if in FF_API_ version guard

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-01 13:44:46 +01:00
Michael Niedermayer 28bb17ca36 Merge commit '399663be9d4a839b894c48a21b62926eb8497d72' 
* commit '399663be9d4a839b894c48a21b62926eb8497d72':
  lls: mark max_order as unsigned short

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-01 13:32:16 +01:00
Michael Niedermayer 76f8d3c8d9 Merge commit '9d4da474f5f40b019cb4cb931c8499deee586174' 
* commit '9d4da474f5f40b019cb4cb931c8499deee586174':
  lls: move to the private namespace

Conflicts:
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-01 13:19:00 +01:00
Michael Niedermayer fb4b160756 Merge commit '7ac6d2423e9bf0f40c67be9a0ca7600b516b0282' 
* commit '7ac6d2423e9bf0f40c67be9a0ca7600b516b0282':
  lls: K&R formatting cosmetics

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-01 13:03:03 +01:00
Diego Biurrun 0b31129389 lls: Do not return from void functions 2013-03-01 01:44:35 +01:00
Diego Biurrun 4da950c0ae lls: #ifndef --> #if in FF_API_ version guard 2013-03-01 01:44:35 +01:00
Luca Barbato 399663be9d lls: mark max_order as unsigned short 
The value is within 0 and 32.

Remove an `array subscript is below array bounds` warning.
 2013-02-28 17:39:24 +01:00
Luca Barbato 9d4da474f5 lls: move to the private namespace 
The functions are private.
 2013-02-28 17:39:24 +01:00
Luca Barbato 7ac6d2423e lls: K&R formatting cosmetics 2013-02-28 17:39:24 +01:00
Michael Niedermayer 4ba35194a9 Merge commit 'f935aca44c674d30e3ed940ef73bbad1228a5855' 
* commit 'f935aca44c674d30e3ed940ef73bbad1228a5855':
  av_memcpy_backptr: avoid an infinite loop for back = 0
  4xm: check the return value of read_huffman_tables().

Conflicts:
	libavcodec/4xm.c
	libavutil/mem.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-24 12:22:51 +01:00
Anton Khirnov f935aca44c av_memcpy_backptr: avoid an infinite loop for back = 0 
CC:libav-stable@libav.org
 2013-02-23 09:16:15 +01:00
Stefano Sabatini ce84c14ab1 lavu/parseutils: remove spurious "]]" in date format specification 2013-02-22 23:45:31 +01:00
Senthilnathan M 12a269a522 lavu/parseutils: allow MM:SS format for duration in av_parse_time() 
Fix trac ticket #2258.

Signed-off-by: Senthilnathan M <senthilnathan.maadasamy@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-02-22 23:43:46 +01:00
Michael Niedermayer 2c21d34ea4 avutil/mem: do a small set of checks for memalign hack before freeing. 
These can detect some kinds of memory and or pointer corruptions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-22 20:42:33 +01:00
Mirjana Vulin 8d2eb5fe58 mips: optimization for float aac decoder (sbr module) 
Signed-off-by: Mirjana Vulin <mvulin@mips.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-21 22:43:08 +01:00
Michael Niedermayer f7b46d86de Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  intreadwrite: tomi: Add missing attributes.h #include for av_always_inline

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-20 12:04:50 +01:00
Diego Biurrun c9ad5f59aa intreadwrite: tomi: Add missing attributes.h #include for av_always_inline 2013-02-20 00:45:30 +01:00
Ronald S. Bultje 0c0828ecc5 x86: Use simple nop codes for <= sse (rather than <= mmx) 
The "CentaurHauls family 6 model 9 stepping 8" family of CPUs
(flags: fpu vme de pse tsc msr cx8 sep mtrr pge mov pat mmx fxsr sse
up rng rng_en ace ace_en) SIGILLs on long nop codes.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-02-19 22:33:19 +02:00
Michael Niedermayer 29c8619a49 fate: add print() to the tests of eval 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-17 17:36:27 +01:00
Michael Niedermayer 09ece9fa6c eval: print() support 
This allows printing values via av_log from expressions.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-17 17:36:27 +01:00