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

11 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
Reinhard Tartler 192bfbc1f1 avutil: elaborate documentation for av_get_random_seed 2011-06-30 21:19:16 +02:00
Michael Niedermayer 94e59cb84b random_seed: more elaborate doxy. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-28 04:29:44 +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
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
Martin Storsjö 576fb48e6d Make ff_random_get_seed public, rename to av_get_random_seed, export the header 
Keep an old ff_ named function for binary compatibility until the
next major bump.

Originally committed as revision 23254 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-23 08:53:40 +00:00
Stefano Sabatini 323a8230fb Fix typo: 'conjuction' -> 'conjunction'. 
Originally committed as revision 17989 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-15 16:36:36 +00:00
Måns Rullgård 9bceffef3a Fix ff_random_get_seed() prototype 
Originally committed as revision 17970 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-14 23:00:57 +00:00
Stefano Sabatini 8358c03479 Fix typos. 
Originally committed as revision 17927 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-10 21:41:31 +00:00
Baptiste Coudurier 48d58e592a add ff_random_get_seed to be used in conjunction with random functions 
Originally committed as revision 17868 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-08 01:28:14 +00:00