virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
Code Issues Releases Activity
37,512 Commits 37 Branches 400 Tags 464 MiB
9b9bf5ab73
Commit Graph

42 Commits

Author SHA1 Message Date
Michael Niedermayer
e37f161e66 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (71 commits)
  movenc: Allow writing to a non-seekable output if using empty moov
  movenc: Support adding isml (smooth streaming live) metadata
  libavcodec: Don't crash in avcodec_encode_audio if time_base isn't set
  sunrast: Document the different Sun Raster file format types.
  sunrast: Add a check for experimental type.
  libspeexenc: use AVSampleFormat instead of deprecated/removed SampleFormat
  lavf: remove disabled FF_API_SET_PTS_INFO cruft
  lavf: remove disabled FF_API_OLD_INTERRUPT_CB cruft
  lavf: remove disabled FF_API_REORDER_PRIVATE cruft
  lavf: remove disabled FF_API_SEEK_PUBLIC cruft
  lavf: remove disabled FF_API_STREAM_COPY cruft
  lavf: remove disabled FF_API_PRELOAD cruft
  lavf: remove disabled FF_API_NEW_STREAM cruft
  lavf: remove disabled FF_API_RTSP_URL_OPTIONS cruft
  lavf: remove disabled FF_API_MUXRATE cruft
  lavf: remove disabled FF_API_FILESIZE cruft
  lavf: remove disabled FF_API_TIMESTAMP cruft
  lavf: remove disabled FF_API_LOOP_OUTPUT cruft
  lavf: remove disabled FF_API_LOOP_INPUT cruft
  lavf: remove disabled FF_API_AVSTREAM_QUALITY cruft
  ...

Conflicts:
	doc/APIchanges
	libavcodec/8bps.c
	libavcodec/avcodec.h
	libavcodec/libx264.c
	libavcodec/mjpegbdec.c
	libavcodec/options.c
	libavcodec/sunrast.c
	libavcodec/utils.c
	libavcodec/version.h
	libavcodec/x86/h264_deblock.asm
	libavdevice/libdc1394.c
	libavdevice/v4l2.c
	libavformat/avformat.h
	libavformat/avio.c
	libavformat/avio.h
	libavformat/aviobuf.c
	libavformat/dv.c
	libavformat/mov.c
	libavformat/utils.c
	libavformat/version.h
	libavformat/wtv.c
	libavutil/Makefile
	libavutil/file.c
	libswscale/x86/input.asm
	libswscale/x86/swscale_mmx.c
	libswscale/x86/swscale_template.c
	tests/ref/lavf/ffm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-01-28 07:53:34 +01:00
Anton Khirnov
62dfea6535 lavc: remove disabled FF_API_OLD_AUDIOCONVERT cruft. 2012-01-27 10:38:33 +01:00
Anton Khirnov
284e65d64e lavc: remove disabled FF_API_OLD_SAMPLE_FMT cruft. 2012-01-27 10:38:33 +01:00
Michael Niedermayer
022f8d27dd Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  swscale: Readd #define _SVID_SOURCE
  Fix av_get_channel_layout_string() for positions >31
  configure: Store vda lib flags in extralibs instead of ldflags
  Make channel layout masks unsigned
  dca: ARMv6 optimised decode_blockcode()
  nullenc: drop AVFMT_RAWPICTURE from the flags
  frame-mt: return consumed packet size in ff_thread_decode_frame
  aacdec: add more fate tests covering SBR and PS
  MK(BE)TAG: avoid undefined shifts

Conflicts:
	configure
	libavcodec/arm/dca.h
	libavcodec/dca.c
	libavcodec/mlp_parser.c
	libavcodec/version.h
	libavfilter/asrc_anullsrc.c
	libavfilter/avfilter.c
	libavfilter/avfilter.h
	libavfilter/defaults.c
	libavutil/audioconvert.c
	libavutil/avutil.h
	libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-26 01:12:08 +01:00
Mans Rullgard
cc276c85d1 Make channel layout masks unsigned 
It makes more sense for a bit mask to use an unsigned type.
The change should be source and binary compatible on all
supported systems, hence micro version bump.

Fixes a few invalid shifts.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-11-25 13:19:54 +00:00
Michael Niedermayer
9891004ba9 Merge remote branch 'qatar/master' 
* qatar/master:
Partially merged:flvdec: Allow parsing keyframes metadata without seeking in most cases
  Error out if vaapi is not found
  avio: undeprecate av_url_read_fseek/fpause under nicer names
  libvo-*: Don't use deprecated sample format names and enum names
DUPLICATE  flvdec: Fix support for flvtool2 "keyframes based" generated index
DUPLICATE  libavcodec: Use "const enum AVSampleFormat[]" in AVCodec initialization
  Fix the conversion of AV_SAMPLE_FMT_FLT and _DBL to AV_SAMPLE_FMT_S32.
  Convert some undefined 1<<31 shifts into 1U<<31.

Conflicts:
	configure
	libavcodec/libvo-aacenc.c
	libavcodec/libvo-amrwbenc.c
	libavformat/flvdec.c

Marged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-13 02:49:22 +02:00
Alex Converse
2f072b55a4 Fix the conversion of AV_SAMPLE_FMT_FLT and _DBL to AV_SAMPLE_FMT_S32. 
(1<<31) is undefined and seems to be evaluated by gcc to -2^31 when
these formulae require 2^31.

These conversions still need fate tests.
 2011-04-11 21:47:53 -07: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
Reinhard Tartler
7ffe76e540 Merge libavcore into libavutil 
Done to keep ABI compatible. Otherwise this is just silly
 2011-02-16 23:00:30 +01:00
Reinhard Tartler
737eb5976f Merge libavcore into libavutil 
It is pretty hopeless that other considerable projects will adopt
libavutil alone in other projects. Projects that need small footprint
are better off with more specialized libraries such as gnulib or rather
just copy the necessary parts that they need. With this in mind, nobody
is helped by having libavutil and libavcore split. In order to ease
maintenance inside and around FFmpeg and to reduce confusion where to
put common code, avcore's functionality is merged (back) to avutil.

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
 2011-02-15 16:18:21 +01:00
Stefano Sabatini
63e8d9760f Use the new libavcore audio channel API. 
This also allows to remove a linking dependency of libavfilter on
libavcodec.

Originally committed as revision 25789 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-21 20:06:22 +00:00
Stefano Sabatini
176a6157c0 Move audio channel API from libavcodec to libavcore. 
Originally committed as revision 25787 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-21 19:28:52 +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
Stefano Sabatini
d63e456a2a Implement functions: 
av_get_sample_fmt_name()
av_get_sample_fmt()
av_get_sample_fmt_string()

in libavcore, and deprecate the corresponding libavcodec/audioconvert.h functions:
avcodec_get_sample_fmt_name()
avcodec_get_sample_fmt()
avcodec_sample_fmt_string()

Originally committed as revision 25653 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-02 22:08:02 +00:00
S.N. Hemanth Meenakshisundaram
5da19b53c6 Implement avcodec_get_channel_layout(). 
Patch by S.N. Hemanth Meenakshisundaram smeenaks:ucsd+edu.

Originally committed as revision 24936 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-26 00:38:25 +00:00
Måns Rullgård
07876e25c8 Workaround for missing llrintf() 
Originally committed as revision 22954 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-23 16:28:10 +00:00
Ronald S. Bultje
b1078e9fe6 Move clipping of audio samples (for those codecs outputting float) from decoder 
to the audio conversion routines.

Originally committed as revision 22937 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-21 17:57:48 +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
Carl Eugen Hoyos
5dfa637cca Make function get_channel_name() static: It is only used in audioconvert.c. 
Originally committed as revision 22114 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-28 18:50:56 +00:00
Justin Ruggles
7ca1295985 Do not guess the channel layout when getting its string value. 
Originally committed as revision 19185 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-13 22:33:13 +00:00
Justin Ruggles
0fb6a8b339 Remove the 3-front-channel layout from the list of channel layout 
aliases.  Calling this "surround" is confusing and questionable.

Originally committed as revision 19183 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-13 18:57:54 +00:00
Justin Ruggles
be233a5691 Check that channel layout is compatible with number of channels for 
output audio stream.

Originally committed as revision 18621 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-19 14:05:55 +00:00
Justin Ruggles
1b7bc4a245 Add 3 channel layout convenience macros. 
Originally committed as revision 18609 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-18 18:51:01 +00:00
Justin Ruggles
f79e331f34 Add names for 5.0 and 5.1 back speaker channel layouts. 
Originally committed as revision 18459 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-12 03:26:20 +00:00
Patrik
862c1d2f05 Replace snprintf() with av_strlcpy(). 
Fixes the following warning on some systems:
audioconvert.c:131: warning: format not a string literal and no format
arguments

Patch by Patrik patrik A yes D nu

Originally committed as revision 17110 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-09 23:11:26 +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
Baptiste Coudurier
4d6f600c58 Add const, remove warning: 
libavcodec/audioconvert.c:190: warning: initialization discards qualifiers from pointer target type

Originally committed as revision 16716 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-22 00:31:26 +00:00
Diego Biurrun
c2fef0c163 Use "" instead of <> when #including non-system headers. 
Originally committed as revision 16689 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-19 23:41:46 +00:00
Carl Eugen Hoyos
7e8efe18ba One const is enough. 
Originally committed as revision 15847 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-17 12:48:31 +00:00
Andreas Öman
9d9b9d32e6 Change multichannel API define prefix from "CHANNEL_" to "CH_". 
Originally committed as revision 15768 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-02 21:04:28 +00:00
Peter Ross
0d72e7d0ae Add audio channel layout API to libavcodec. 
Originally committed as revision 15762 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-01 05:03:42 +00:00
Diego Pettenò
d3b9e7f19b Remove duplicate "const" qualifier for *matrix. 
This silences out a warning when compiling with Intel C Compiler.
Patch by Diego 'Flameeyes' Pettenò %flameeyes A gmail P com%

Originally committed as revision 15524 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-02 19:09:56 +00:00
Michael Niedermayer
23694e27f0 Drop deprecated SAMPLE_FMT_S24. 
Originally committed as revision 15264 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-08 15:24:16 +00:00
Peter Ross
e06b00f3b6 Add SAMPLE_FMT_DBL. 
Originally committed as revision 14832 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-19 10:36:30 +00:00
Peter Ross
82cee279a5 Modify av_audio_convert() to use AVAudioConvert context struct; add av_audio_convert_alloc() and av_audio_convert_free() support functions. 
Originally committed as revision 14496 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-01 13:53:18 +00:00
Peter Ross
8a464e7580 Revert r14484 hunk that deleted the 'include avcodec.h' statement. 
Originally committed as revision 14495 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-01 11:26:22 +00:00
Peter Ross
c2b28bb975 Add sample format support functions: avcodec_get_sample_fmt_name(), avcodec_get_sample_fmt(), avcodec_sample_fmt_string() 
Originally committed as revision 14484 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-31 12:55:06 +00:00
Diego Biurrun
e5a389a1b7 license header consistency cosmetics 
Originally committed as revision 9484 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-05 10:40:25 +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
b78e7197a8 Change license headers to say 'FFmpeg' instead of 'this program/this library' 
and fix GPL/LGPL version mismatches.

Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-07 15:30:46 +00:00
Michael Niedermayer
ed567d9c41 cosmetics 
Originally committed as revision 6032 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-19 23:12:10 +00:00
Michael Niedermayer
0eb6817d98 audio format conversion 
untested and unused

Originally committed as revision 6029 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-19 20:22:57 +00:00