RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
29,943 Commits 36 Branches 398 Tags 232 MiB
Commit Graph

11 Commits

Author SHA1 Message Date
Michael Niedermayer 2fd41c9067 Merge remote-tracking branch 'newdev/master' 
* newdev/master:
  avio: make udp_set_remote_url/get_local_port internal.
  asfdec: also subtract preroll when reading simple index object
  matroskaenc: remove a variable that's unused after bc17bd9.
  avio: cosmetics - nicer vertical alignment.
  Remove unnecessary icc version checks
  Disable 'attribute "foo" ignored' warnings from icc
  rtsp: Don't use a locale dependent format string
  Add xd55 codec tag for XDCAM HD422 720p25 CBR files.
  configure: get libavcodec version from new version.h header
  lavc: move the version macros to a new installed header.
  matroskaenc: simplify get_aac_sample_rates by using ff_mpeg4audio_get_config
  Do not use format string "%0.3f" for RTSP Range field.
  Add apply_window_int16() to DSPContext with x86-optimized versions and use it in the ac3_fixed encoder.
  Document usage of import libraries created by dlltool
  configure: Set the correct lib target for arm/wince dlltool
  fate: simplify regression-funcs.sh
  fate: add support for multithread testing

Conflicts:
	libavformat/rtspdec.c
	libavutil/attributes.h
	libavutil/internal.h
	libavutil/mem.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-24 02:16:11 +01:00
Mans Rullgard 820818a330 Remove unnecessary icc version checks 
With unknown attribute warnings disabled, these checks are no
longer needed.  Removing them improves readability while having
no effect on generated code.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-23 12:39:58 +00: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
Carl Eugen Hoyos a5b13b1423 Use macro __INTEL_COMPILER instead of __ICC. 
__ICC is not supported on all platforms, this is an Intel documentation
bug that is supposed to be fixed in a future release.
(Intel issue 612289)
 2011-03-02 13:38:21 +01:00
Mans Rullgard 0374152f89 Rename attribute_used to av_used and move it to attributes.h 
This is consistent with most of the other attribute macros.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 365e3c7878)
 2011-01-31 18:25:48 +01:00
Mans Rullgard 365e3c7878 Rename attribute_used to av_used and move it to attributes.h 
This is consistent with most of the other attribute macros.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-31 16:01:26 +00:00
Carl Eugen Hoyos 086e997e34 Intel C compiler 12.0 does not suport these attributes: may_alias, force_align_arg_pointer and alloc_size. 
Originally committed as revision 25716 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-11-10 12:45:41 +00:00
Michael Niedermayer a74d707cb7 av_alias is an attribute and belongs to attributes.h 
also attributes.h is public and external api and can thus not depend
on configure tested compiler support thus this part is removed. A
different solution must be found if this breaks for some compiler
which i hope it does not.

Originally committed as revision 23115 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-13 16:30:58 +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
Michael Niedermayer 4ed39eedca av_builtin_constant_p() 
Originally committed as revision 22770 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-04-02 01:03:27 +00:00
Måns Rullgård 2791730dbf Move gcc attribute macros to new header libavutil/attributes.h 
Originally committed as revision 22346 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-08 21:28:56 +00:00