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

31 Commits

Author SHA1 Message Date
Michael Niedermayer 0b9a69f244 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (22 commits)
  aacdec: Fix PS in ADTS.
  avconv: Consistently use PIX_FMT_NONE.
  dsputil: use cpuflags in x86 emu_edge_core
  dsputil: use movups instead of movdqu in ff_emu_edge_core_sse()
  wma: initialize prev_block_len_bits, next_block_len_bits, and block_len_bits.
  mov: Remove some redundant and obsolete comments.
  Add libavutil/mathematics.h #includes for INFINITY
  doxy: structure libavformat groups
  doxy: introduce an empty structure in libavcodec
  doxy: provide a start page and document libavutil
  doxy: cleanup pixfmt.h
  regtest: split video encode/decode tests into individual targets
  ARM: add explicit .arch and .fpu directives to asm.S
  pthread: do not touch has_b_frames
  avconv: cleanup the transcoding loop in output_packet().
  avconv: split subtitle transcoding out of output_packet().
  avconv: split video transcoding out of output_packet().
  avconv: split audio transcoding out of output_packet().
  avconv: reindent.
  avconv: move streamcopy-only code out of decoding loop.
  ...

Conflicts:
	avconv.c
	libavcodec/aaccoder.c
	libavcodec/pthread.c
	libavcodec/version.h
	libavutil/audioconvert.h
	libavutil/avutil.h
	libavutil/mem.h
	tests/ref/vsynth1/dv
	tests/ref/vsynth1/mpeg2thread
	tests/ref/vsynth2/dv
	tests/ref/vsynth2/mpeg2thread

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-23 04:02:17 +01:00
Luca Barbato 757cd8d876 doxy: provide a start page and document libavutil 
Introduce a basic layout, the subpages are currently left empty.

Split libavutil in multiple groups as example of the structure
 2011-11-22 17:16:02 +01: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 3a1429ec3c Update av_cmp_q() documentation after r25338. 
Originally committed as revision 25340 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-05 08:44:18 +00:00
Michael Niedermayer dec1126915 Make av_cmp_q() work with infinities and NAN. 
Originally committed as revision 25338 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-05 01:43:31 +00:00
Stefano Sabatini 6b4ed22f75 Make av_d2q() manage the case in which the value to convert is inf. 
Originally committed as revision 25332 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-04 13:41:01 +00:00
Michael Niedermayer 8a47d90b29 Fix av_cmp_q() with negative denominators. 
Originally committed as revision 25283 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-01 12:00: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
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
Måns Rullgård 2ed6f39944 Replace many includes of libavutil/common.h with what is actually needed 
This reduces the number of false dependencies on header files and
speeds up compilation.

Originally committed as revision 22407 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-09 17:39:19 +00:00
Stefano Sabatini bf7e799c9e Remove '\p', '\c' and '\e' doxygen markup from doxy, as it should 
improve plain text doxy readability.

See the thread: "[RFC] Should we use doxygen markup?".

Originally committed as revision 19122 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-06 09:35:15 +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 674bd4f691 cosmetics: Use 'num' instead of 'nom' as abbreviation for numerator. 
Originally committed as revision 16910 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-01 00:20:45 +00:00
Diego Biurrun 89c9ff504b spelling/grammar/consistency review part I 
Originally committed as revision 16840 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-28 00:16:05 +00:00
Stefano Sabatini 05b90fc0c5 Implement av_nearer_q() and av_find_nearest_q_idx() functions. 
Originally committed as revision 15415 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-25 19:23:13 +00:00
Stefano Sabatini 987903826b Globally rename the header inclusion guard names. 
Consistently apply this rule: the guard name is obtained from the
filename by stripping the leading "lib", converting '/' and '.'  to
'_' and uppercasing the resulting name. Guard names in the root
directory have to be prefixed by "FFMPEG_".

Originally committed as revision 15120 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-31 07:39:47 +00:00
Zuxy Meng 85074d3c93 Reapply r12489: Add pure, const and malloc attributes to proper functions 
in libavutil.
Fix a compilation failure in r12489.

Originally committed as revision 12498 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-19 06:17:43 +00:00
Benoit Fouet 2119bb8f51 revert r12489. 
Originally committed as revision 12490 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-18 16:29:47 +00:00
Zuxy Meng 6544f48f03 Pure, const and malloc attributes to libavutil. 
Patch by Zuxy Meng: zuxy meng gmail com
Original thread:
[FFmpeg-devel] [PATCH] Pure, const and malloc attributes to libavutil
Date: 03/18/2008 6:09 AM

Originally committed as revision 12489 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-18 15:27:15 +00:00
Diego Biurrun 5b21bdabe4 Add FFMPEG_ prefix to all multiple inclusion guards. 
Originally committed as revision 10765 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-10-17 09:37:46 +00:00
Alex Beregszaszi 71e4199485 match doxygen comment with other parts of the file 
Originally committed as revision 9635 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-14 00:15:01 +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
Måns Rullgård 99545457bf include all prerequisites in header files 
Originally committed as revision 9344 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-16 22:59:13 +00:00
Guillaume Poirier ca9049efc8 fix 2 mistakes in doxy comments, spotted by Michael 
Originally committed as revision 8133 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-26 14:53:42 +00:00
Dujardin Bernard 0b0065992e move doxy comments from rational.c to rational.h and add some new comments 
patch by Dujardin Bernard %dujardin P iut A numericable P fr%

Originally committed as revision 8132 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-26 14:27:29 +00:00
Dujardin Bernard 1c95ef8b97 Doxygenize some comments 
Patch by Dujardin Bernard % dujardin P iut A numericable P fr %

Originally committed as revision 8131 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-26 08:52:21 +00:00
Diego Biurrun 804de96a83 cosmetics: fix usefuLL --> usefuL typo 
Originally committed as revision 8061 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-22 00:07:42 +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
Diego Biurrun 5509bffa88 Update licensing information: The FSF changed postal address. 
Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-01-12 22:43:26 +00:00
Diego Biurrun 115329f160 COSMETICS: Remove all trailing whitespace. 
Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-17 18:14:38 +00:00
Alexander Strasser c11c2bc20b libavutil: Utility code from libavcodec moved to a separate library. 
Originally committed as revision 4489 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-08-01 20:07:05 +00:00