RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
32,012 Commits 37 Branches 400 Tags 277 MiB
Commit Graph

17 Commits

Author SHA1 Message Date
Stefano Sabatini 263f57c6d7 pixdesc: remove duplicated header inclusion 2011-06-06 11:34:45 +02:00
Michael Niedermayer b8a43bc1b5 Merge remote-tracking branch 'qatar/master' into master 
* qatar/master: (27 commits)
  ac3enc: fix LOCAL_ALIGNED usage in count_mantissa_bits()
  ac3dsp: do not use the ff_* prefix when referencing ff_ac3_bap_bits.
  ac3dsp: fix loop condition in ac3_update_bap_counts_c()
  ARM: unbreak build
  ac3enc: modify mantissa bit counting to keep bap counts for all values of bap instead of just 0 to 4.
  ac3enc: split mantissa bit counting into a separate function.
  ac3enc: store per-block/channel bap pointers by reference block in a 2D array rather than in the AC3Block struct.
  get_bits: add av_unused tag to cache variable
  sws: replace all long with int.
  ARM: aacdec: fix constraints on inline asm
  ARM: remove unnecessary volatile from inline asm
  ARM: add "cc" clobbers to inline asm where needed
  ARM: improve FASTDIV asm
  ac3enc: use LOCAL_ALIGNED macro
  APIchanges: fill in git hash for av_get_pix_fmt_name (0420bd7).
  lavu: add av_get_pix_fmt_name() convenience function
  cmdutils: remove OPT_FUNC2
  swscale: fix crash in bilinear scaling.
  vpxenc: add VP8E_SET_STATIC_THRESHOLD mapping
  webm: support stereo videos in matroska/webm muxer
  ...

Conflicts:
	Changelog
	cmdutils.c
	cmdutils.h
	doc/APIchanges
	doc/muxers.texi
	ffmpeg.c
	ffplay.c
	libavcodec/ac3enc.c
	libavcodec/ac3enc_float.c
	libavcodec/avcodec.h
	libavcodec/get_bits.h
	libavcodec/libvpxenc.c
	libavcodec/version.h
	libavdevice/libdc1394.c
	libavformat/matroskaenc.c
	libavutil/avutil.h
	libswscale/rgb2rgb.c
	libswscale/swscale.c
	libswscale/swscale_template.c
	libswscale/x86/swscale_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-29 03:34:35 +02:00
Stefano Sabatini e71f26086a lavu: add av_get_pix_fmt_name() convenience function 
Also deprecate avcodec_get_pix_fmt_name() in its favor.
 2011-05-28 18:25:40 +02:00
Stefano Sabatini 8f653e28f5 lavu: add av_get_pix_fmt_name() convenience function 
Also deprecate avcodec_get_pix_fmt_name() in its favor.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-05-28 09:44:18 -04: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
Stefano Sabatini bb4afa13dd Deprecate avcodec_pix_fmt_string() in favor of 
av_get_pix_fmt_string(), added to libavutil/pixdesc.h.

Originally committed as revision 25879 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-04 12:56:21 +00:00
Stefano Sabatini ee4355808c Reindent after r24101. 
Originally committed as revision 24126 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-08 22:05:33 +00:00
Stefano Sabatini ce1cd1cba2 Rename read/write_line() to av_read/write_image_line(). 
The old names were not av_ prefixed, and they were causing linking
failure on many platforms.  The new names are also more descriptive.

Patch by Stefano Sabatini.

Originally committed as revision 24101 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-07 23:41:42 +00:00
Diego Biurrun 9a58234fea Fix misspelled parameter names in Doxygen documentation. 
This fixes one Doxygen warning each.

Originally committed as revision 23970 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-02 10:49:29 +00:00
Måns Rullgård 49bd8e4b84 Fix grammar errors in documentation 
Originally committed as revision 23904 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-30 15:38:06 +00:00
Stefano Sabatini f47a7cb777 Move read_line() and write_line() definition from pixdesc.h to 
pixdesc.c, which are now not anymore marked as static inline.

Fix the inclusion of the private header intreadwrite.h in the public
header pixdesc.h.

Originally committed as revision 21854 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-16 20:17:50 +00:00
Stefano Sabatini 351aff72a4 Fix grammar: write to DST THING -> write THING to DST. 
Originally committed as revision 21576 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-31 17:13:57 +00:00
Stefano Sabatini 80a07f6e47 Implement av_get_pix_fmt(), and deprecate avcodec_get_pix_fmt(). 
Originally committed as revision 21545 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-30 18:50:00 +00:00
Stefano Sabatini 60fa95683d Clarify PIX_FMT_BE flag doxy. Increase consistency / pickiness. 
Originally committed as revision 20592 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-23 20:14:47 +00:00
Stefano Sabatini 357561e73f Clarify relations between log2_chroma_w, log2_chroma_h and comp. 
Originally committed as revision 20550 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-18 22:32:32 +00:00
Stefano Sabatini b8873c2a8f Rename AVPixFmtDescriptor.nb_channels to nb_components, the new name 
is more clear and lexically more consistent with API and
documentation.

Originally committed as revision 20545 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-18 00:07:20 +00:00
Stefano Sabatini 51135d1d8e Move pixdesc.{h,c} from libavcodec to libavutil. 
This way pixdescs can be used without requiring a dependency on
libavcodec.

Originally committed as revision 20389 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-27 20:56:56 +00:00