Commit Graph

51947 Commits

Author SHA1 Message Date
Michael Niedermayer
97104aa011 Merge commit 'f223ad1e000d56ef5231a3b1fc00495b538a9ed6'
* commit 'f223ad1e000d56ef5231a3b1fc00495b538a9ed6':
  doc: document the prores encoder options

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 22:36:12 +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
Clément Bœsch
9ab221f8d8 lavfi: deprecate aconvert.
This filter is not required anymore with aformat. Drop it at next bump.
2013-04-11 22:13:45 +02:00
Clément Bœsch
71ef1ec7b4 lavfi/aspect: switch to an AVOptions-based system.
This is heavily based on 2831b307 by Anton Khirnov <anton@khirnov.net>
2013-04-11 22:05:03 +02:00
Michael Niedermayer
647fe2e777 Merge commit '9e6b5e61a0c91e25e298d0a21b189c4c95443795'
* commit '9e6b5e61a0c91e25e298d0a21b189c4c95443795':
  img2enc: add an option for overwriting one file with subsequent images

Conflicts:
	doc/muxers.texi
	libavformat/img2enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 21:50:53 +02:00
Stefano Sabatini
976e3439ed lavfi/flite: switch to AVOption-based system 2013-04-11 21:37:48 +02:00
Stefano Sabatini
160ed967f4 lavfi/hue: extend debugging message
In particular, show h value in degrees.
2013-04-11 21:37:43 +02:00
Stefano Sabatini
3411aba82c lavfi/hue: reindent after last commit 2013-04-11 21:37:35 +02:00
Stefano Sabatini
e4fd58f472 lavfi/hue: apply major simplifications, and switch to AVOption-based system
This also drops support for "flat syntax" and "reinit" command.

"reinit" command is not very robust and complicates the logic more than
necessary, since requires to reset all the options in the command.

*This is a syntax break*.
2013-04-11 21:37:19 +02:00
Clément Bœsch
c36ab01cd2 lavfi/ebur128: remove now unused av_opt_free call. 2013-04-11 20:52:41 +02:00
Michael Niedermayer
4f43e9b4af avfilter/aresample: use init_dict system and set child AVOption context correctly
Parts of this commit are based on: 4fa1f52e

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 20:40:59 +02:00
Michael Niedermayer
f6bfeef7fa avfilter: fix handing of child context options
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 20:40:30 +02:00
Clément Bœsch
c1907bd732 lavfi/removelogo: switch to an AVOptions-based system. 2013-04-11 18:49:46 +02:00
Tobias Rapp
7f09b888e8 avienc: fix overflow of audio sample count
Fixes an overflow of the sample count field within the audio stream header
chunk if audio stream data exceeds 2GB.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 18:33:24 +02:00
Michael Niedermayer
865e20daf3 avfilter/f_select: use AVFrame metadata accessor function
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 18:33:24 +02:00
Clément Bœsch
c74b0eda34 lavfi/amerge: switch to an AVOptions-based system. 2013-04-11 18:31:01 +02:00
Clément Bœsch
eabc0c733d ffmpeg: insert format filter with the appropriate separator.
Similar to 937325f3.
2013-04-11 18:05:46 +02:00
Clément Bœsch
23a750c994 lavfi: do not warn inappropriately with aevalsrc. 2013-04-11 18:01:12 +02:00
Clément Bœsch
937325f3db ffmpeg: insert aformat filter with the appropriate separator.
The ',' separator is deprecated with aformat, and thus causes various
arnings when transcoding audio.
2013-04-11 17:51:22 +02:00
Clément Bœsch
64ce15b9f4 lavfi/aevalsrc: switch to an AVOptions-based system. 2013-04-11 17:28:02 +02:00
James Almer
94d13df34c Fix compilation with --disable-everything --enable-filter=deshake
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 16:33:02 +02:00
Stephen Hutchinson
ff99b42e04 avformat/avisynth: Don't insert null frames or samples at the start of a stream.
This is the last remaining issue from ticket #2412

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 16:32:14 +02:00
Paul B Mahol
d185343687 libshine fixed point MP3 encoding support
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-11 14:27:59 +00:00
Michael Niedermayer
fb78b94c3a cmdutils_common_opts: fix indention of #if
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 16:07:46 +02:00
Michael Niedermayer
0a95449d2f cmdutils: remove unneeded #if
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 16:07:11 +02:00
highgod0401
d757f7510b cmdutils: add opencl command line options to ffmpeg
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 16:05:19 +02:00
Paul B Mahol
567feaafa8 lavfi/bbox: remove unused variables and functions
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-11 14:02:59 +00:00
Michael Niedermayer
580a0600ef Merge remote-tracking branch 'qatar/master'
* qatar/master:
  Move misplaced file author information where it belongs

Conflicts:
	libavcodec/adpcm.c
	libavcodec/adpcmenc.c
	libavcodec/gif.c
	libavcodec/x86/dsputilenc_mmx.c
	libavcodec/x86/fmtconvert_init.c
	libavformat/au.c
	libavformat/gif.c
	libavformat/mov.c
	libavformat/nsvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 15:56:18 +02:00
Clément Bœsch
ad9e66a565 lavfi: add pp to the ':'-to-'|' compat layer. 2013-04-11 15:52:46 +02:00
Michael Niedermayer
cf7d3846fc Merge commit '9de9b828ef005dec37052548c195a6b4f18fc701'
* commit '9de9b828ef005dec37052548c195a6b4f18fc701':
  lavc: don't overwrite display dimensions with coded dimensions.
  lavc: extend / update the [coded_]{width,height} doxy

Conflicts:
	libavcodec/avcodec.h
	libavcodec/utils.c

The change to the w/h handling is not merged as it breaks lowres

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 15:42:32 +02:00
Clément Bœsch
e2e992c077 lavfi/asetnsamples: switch to an AVOptions-based system. 2013-04-11 15:40:15 +02:00
Clément Bœsch
1c0feee059 lavfi/anullsrc: switch to an AVOptions-based system. 2013-04-11 15:21:40 +02:00
Clément Bœsch
7464b9e319 lavfi: remove bbox from the filters left to update.
The filter doesn't take any option and thus works with the new system.
2013-04-11 15:14:07 +02:00
Paul B Mahol
11f6174a91 lavfi/blend: support more yuv pixel formats
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-11 13:10:11 +00:00
Clément Bœsch
7fdebb116c lavfi/astreamsync: switch to an AVOptions-based system. 2013-04-11 15:09:25 +02:00
Clément Bœsch
2fb8ca7d2c lavfi/astreamsync: fix eval memleak. 2013-04-11 15:09:25 +02:00
Michael Niedermayer
5ec016ad0b Merge commit '20429ba96e55db17ac57f6c0e330914287f1f614'
* commit '20429ba96e55db17ac57f6c0e330914287f1f614':
  h261: Move encoder/decoder shared table init to common code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 14:48:27 +02:00
Clément Bœsch
ab4afcb85b lavfi/blackdetect: switch to an AVOptions-based system. 2013-04-11 14:48:19 +02:00
Clément Bœsch
7eb1ea2ae6 lavfi/sendcmd: switch to an AVOptions-based system. 2013-04-11 14:40:02 +02:00
Clément Bœsch
389eb0a919 lavfi/testsrc: remove useless args/NULL passing. 2013-04-11 14:36:50 +02:00
Michael Niedermayer
dd97736d4f avfilter: add missing ,
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 14:31:10 +02:00
Michael Niedermayer
567616c1b3 Merge commit '8a776ad90e00ab2b98e8683ac6182d641a383c3a'
* commit '8a776ad90e00ab2b98e8683ac6182d641a383c3a':
  h261: Move shared data tables from a header to a proper C file

Conflicts:
	libavcodec/Makefile
	libavcodec/h261data.c
	libavcodec/h261dec.c
	libavcodec/h261enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 14:25:38 +02:00
Paul B Mahol
38d1a5a270 lavfi/smptebars: switch to AVOptions-based system
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-11 12:22:42 +00:00
Clément Bœsch
3c2e4c2a9b lavfi/showwaves: switch to an AVOptions-based system. 2013-04-11 14:18:44 +02:00
Clément Bœsch
38788f2de5 lavfi: replace new filter list with filters left to update. 2013-04-11 14:06:39 +02:00
highgod0401
d83c481dc0 MAINTAINERS: add opencl maintainer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 13:42:07 +02:00
Marton Balint
f1e606c762 mxfdec: update current edit unit when seeking in mxf files without index tables
Fixes audio packet pts values in some files generated by AVID TRMG 3.01.

Signed-off-by: Marton Balint <cus@passwd.hu>
Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 13:35:58 +02:00
Michael Niedermayer
eeb6efcd58 Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
  fate: add tests for unknown channel layouts.
  lavfi/buffersrc: update for compatibility with the fork.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 13:28:24 +02:00
Paul B Mahol
32a7b858c9 lavfi: remove telecine libmpcodecs wrapper
Native, with more features, filter is available.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-11 11:22:11 +00:00
Paul B Mahol
10b1cc63c2 lavfi: remove double .priv_class initializers
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-11 11:13:42 +00:00