virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-12 19:18:44 +02:00
Code Issues Releases Activity
36,339 Commits 37 Branches 400 Tags 463 MiB
fba6777363
Commit Graph

41 Commits

Author SHA1 Message Date
Michael Niedermayer
00c0465dbc Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  fate: split off DPCM codec FATE tests into their own file
  fate: split off PCM codec FATE tests into their own file
  libvorbis: K&R reformatting cosmetics
  libmp3lame: K&R formatting cosmetics
  fate: Add a video test for xxan decoder
  mpegvideo_enc: K&R cosmetics (line 1000-2000).
  avconv: K&R cosmetics
  qt-faststart: Fix up indentation
  indeo4: remove two unused variables
  doxygen: cleanup style to support older doxy
  fate: add more tests for VC-1 decoder
  applehttpproto: Apply the same reload interval changes as for the demuxer
  applehttp: Use half the target duration as interval if the playlist didn't update
  applehttp: Use the last segment duration as reload interval
  lagarith: add decode support for arith rgb24 mode

Conflicts:
	avconv.c
	libavcodec/libmp3lame.c
	libavcodec/mpegvideo_enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-12-30 03:46:24 +01:00
Aneesh Dogra
c4db344664 libmp3lame: K&R formatting cosmetics 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2011-12-29 23:30:20 +01:00
Stefano Sabatini
5b1a06b1c9 libmp3lame: log error message in case of invalid number of channels 
Also return meaningful error number in place of -1.
Improve feedback.
 2011-10-30 21:10:54 +01:00
Michael Niedermayer
f884ef00de Merge remote-tracking branch 'qatar/master' 
* qatar/master: (31 commits)
  tiffenc: initialize forgotten avctx.
  avplay: free the active audio packet at exit.
  avplay: free rdft data used for spectrogram analysis.
  log.h: make AVClass a named struct
  fix ac3 encoder documentation
  vc1: more prettyprinting cosmetics
  vc1: prettyprint some tables
  vc1: K&R formatting cosmetics
  AVOptions: bump minor and add APIchanges entry.
  cmdutils/avtools: simplify show_help() by using av_opt_child_class_next()
  AVOptions: rename FF_OPT_TYPE_* => AV_OPT_TYPE_*
  Remove all uses of deprecated AVOptions API.
  AVOptions: add av_opt_next, deprecate av_next_option.
  AVOptions: add functions for evaluating option strings.
  AVOptions: split get_number().
  AVOptions: add av_opt_get*, deprecate av_get*.
  AVOptions: add av_opt_set*().
  AVOptions: add new API for enumerating children.
  rv34: move inverse transform functions to DSP context
  flvenc: Write the right metadata entry count
  ...

Conflicts:
	avconv.c
	cmdutils.c
	doc/APIchanges
	ffplay.c
	ffprobe.c
	libavcodec/ac3dec.c
	libavcodec/h264.c
	libavcodec/libvpxenc.c
	libavcodec/libx264.c
	libavcodec/mpeg12enc.c
	libavcodec/options.c
	libavdevice/libdc1394.c
	libavdevice/v4l2.c
	libavfilter/vf_drawtext.c
	libavformat/flvdec.c
	libavformat/mpegtsenc.c
	libavformat/options.c
	libavutil/avutil.h
	libavutil/opt.c
	libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-10-13 06:00:03 +02:00
Anton Khirnov
145f741e11 AVOptions: rename FF_OPT_TYPE_* => AV_OPT_TYPE_* 2011-10-12 16:51:16 +02:00
Michael Niedermayer
58677d73ed Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avconv: fix some bugs introduced in 630902a1e1
  libmp3lame: fix typo
  AVOptions: drop av_ prefix from static av_get_number().
  libx264: use X264_THREADS_AUTO constant instead of 0.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-01 22:08:44 +02:00
Anton Khirnov
9bc9188e58 libmp3lame: fix typo 
FF_API_LAME_GLOBAL_OPTIONS => FF_API_LAME_GLOBAL_OPTS

Thanks to Clément Bœsch for spotting.
 2011-09-01 10:37:19 +02:00
Michael Niedermayer
0ed7bc49a3 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (31 commits)
  libx264: set default thread count to 0 (auto)
  lavc: cosmetics, group deprecated codec flags
  mpeg12: add 'scan_offset' private option.
  h263/p encoder: add 'structured_slices' private option.
  h263/p encoder: add 'obmc' private option.
  h263p encoder: add 'aiv' private option.
  h263p encoder: add 'umv' private option.
  mpeg12enc/mpeg4videoenc: add 'alternate_scan' private option.
  mjpegdec: add 'extern_huff' private option.
  mpeg4enc: add 'data_partitioning' private option.
  snow: add 'memc_only' private option.
  libx264: add 'mbtree' private option.
  libx264: add 'psy' private option.
  libmp3lame: add 'reservoir' private option.
  mpeg2enc: add 'non_linear_quant' private option
  mpeg12enc: add drop_frame_timecode private option.
  mpeg12enc: add intra_vlc private option.
  VC1: Support dynamic dimension changes
  mjpeg: treat external huffman table setup failure as codec init failure if external huffman table use requested
  lavc: deprecate CODEC_FLAG2_BRDO
  ...

Conflicts:
	avconv.c
	libavcodec/libmp3lame.c
	libavcodec/libx264.c
	libavcodec/mjpegdec.c
	libavcodec/mpeg12enc.c
	libavcodec/mpegvideo.h
	libavcodec/vc1.c
	libavcodec/vc1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-01 00:01:21 +02:00
Anton Khirnov
a7cec3a094 libmp3lame: add 'reservoir' private option. 
Deprecate CODEC_FLAG2_BIT_RESERVOIR
 2011-08-31 13:22:53 +02:00
Michael Niedermayer
faba79e080 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  mxfdec: Include FF_INPUT_BUFFER_PADDING_SIZE when allocating extradata.
  H.264: tweak some other x86 asm for Atom
  probe: Fix insane flow control.
  mpegts: remove invalid error check
  s302m: use nondeprecated audio sample format API
  lavc: use designated initialisers for all codecs.
  x86: cabac: add operand size suffixes missing from 6c32576

Conflicts:
	libavcodec/ac3enc_float.c
	libavcodec/flacenc.c
	libavcodec/frwu.c
	libavcodec/pictordec.c
	libavcodec/qtrleenc.c
	libavcodec/v210enc.c
	libavcodec/wmv2dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-07-30 06:46:08 +02:00
Anton Khirnov
ec6402b7c5 lavc: use designated initialisers for all codecs. 
It's more readable and less prone to breakage.
 2011-07-29 08:42:34 +02:00
Ronald S. Bultje
03c804e1ed mp3lame: add #include required for AV_RB32 macro. 
Fixes compilation with mp3lame enabled.
 2011-05-20 15:28:29 -04:00
Stefano Sabatini
ed96fffb6e libmp3lame: include "libavutil/intreadwrite.h" header 
Fix compilation.
 2011-05-20 09:34:56 +02:00
Peter Belkner
39e69d0b88 32bit libmp3lame support. 2011-04-19 13:25:05 +02:00
Peter Belkner
22fa406f38 Check avcodec_alloc_frame() failure. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-19 13:25:05 +02:00
Mans Rullgard
2912e87a6c Replace FFmpeg with Libav in licence headers 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-19 13:33:20 +00:00
Diego Elio Pettenò
e7e2df27f8 Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf. 
None of these symbols should be accessed directly, so declare them as
hidden.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit d36beb3f69)
 2011-01-28 03:15:34 +01:00
Diego Elio Pettenò
d36beb3f69 Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf. 
None of these symbols should be accessed directly, so declare them as
hidden.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-26 16:08:45 +00:00
Stefano Sabatini
5d6e4c160a Replace deprecated symbols SAMPLE_FMT_* with AV_SAMPLE_FMT_*, and enum 
SampleFormat with AVSampleFormat.

Originally committed as revision 25730 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-12 11:04:40 +00:00
Thierry Foucu
769b74ab85 Allow mono encoding with LAME. 
Patch by Thierry Foucu, tfoucu gmail

Originally committed as revision 25650 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-02 20:29:20 +00:00
Carl Eugen Hoyos
eb6fb058f2 Remove useless comment. 
Originally committed as revision 25129 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-16 08:30:01 +00:00
James Darnley
efec9ac8a9 Allow float values for libmp3lame quality. 
Patch by James Darnley, james D darnley A gmail

Originally committed as revision 25128 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-09-15 22:10:13 +00:00
Michael Niedermayer
ddecab2097 Set .supported_samplerates for mpeg audio encoders. 
Originally committed as revision 22944 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-22 09:41:45 +00:00
Diego Biurrun
ba87f0801d Remove explicit filename from Doxygen @file commands. 
Passing an explicit filename to this command is only necessary if the
documentation in the @file block refers to a file different from the
one the block resides in.

Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-20 14:45:34 +00:00
Stefano Sabatini
72415b2adb Define AVMediaType enum, and use it instead of enum CodecType, which 
is deprecated and will be dropped at the next major bump.

Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-30 23:30:55 +00:00
Reimar Döffinger
b5f09d31c2 Make sample_fmts and channel_layouts compound literals const to reduce size of 
.data section.

Originally committed as revision 19787 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-06 09:15:07 +00:00
Diego Biurrun
bad5537e2c Use full internal pathname in doxygen @file directives. 
Otherwise doxygen complains about ambiguous filenames when files exist
under the same name in different subdirectories.

Originally committed as revision 16912 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-01 02:00:19 +00:00
Diego Biurrun
99ed41a808 Fix filenames in Doxygen comments. 
Originally committed as revision 16811 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-26 22:51:16 +00:00
Michael Niedermayer
c8af74a99b Increase BUFFER_SIZE. 
Fixes issue719.

Originally committed as revision 16541 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-11 16:35:04 +00:00
Michael Niedermayer
203fa6b4d1 fix indention 
Originally committed as revision 16540 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-11 16:17:36 +00:00
Michael Niedermayer
2083648383 All negative values are errors not just -1. 
Originally committed as revision 16539 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-11 16:16:33 +00:00
Nicolas George
afffd357b0 Use compression level to set mp3lame quality option. 
Patch by Nicolas George nicolas george normalesup org
Original thread:
[PATCH] libmp3lame: set noise shaping & psychoacoustic algorithms quality
Date: 07/31/2008 03:53 PM

Originally committed as revision 14494 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-01 07:23:29 +00:00
Peter Ross
fd76c37fd9 Modify all codecs to report their supported input and output sample format(s). 
Originally committed as revision 14482 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-31 10:47:31 +00:00
Stefano Sabatini
fe4bf37455 Make AVCodec long_names definition conditional depending on CONFIG_SMALL. 
Originally committed as revision 13759 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-12 21:50:13 +00:00
Stefano Sabatini
162d4fc99d Add long names to AVCodec declarations. 
patch by Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 13009 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-27 22:39:51 +00:00
Zuxy Meng
98a6fff98c Apply 'cold' attribute to init/uninit functions in libavcodec 
Originally committed as revision 12525 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-21 03:11:20 +00:00
Paul Kelly
f1618fd939 Add 'reservoir' flag to lavc's flags2 controlling whether or not codes may 
utilize a bit reservoir. Also, make the lame encoder utilize this flag.

patch by Paul Kelly, paul a stjohnspoint d co d uk

Originally committed as revision 11903 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-11 08:01:07 +00:00
Andreas Öman
c7d96ac69f increase buffer size of LAME MP3 encoder 
The previous size lead to A/V sync issues
Patch by Andreas Öman %andreas AA olebyn PP nu%
Original thread:
Date: Jul 21, 2007 9:53 AM
Subject: [FFmpeg-devel] [PATCH] lame buffer shortage

Originally committed as revision 9786 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-24 09:59:54 +00:00
Diego Biurrun
755bfeabcc misc spelling fixes 
Originally committed as revision 9289 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-12 09:29:25 +00:00
Diego Biurrun
1cc60c47c5 Consistent naming and lib prefixes for x264, xvid and mp3lame within the code. 
Originally committed as revision 9230 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-06 08:51:41 +00:00
Diego Biurrun
6f1af73557 Give all wrappers for external libraries names starting with lib. 
Originally committed as revision 9226 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-06 00:14:18 +00:00