1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-07 11:13:41 +02:00
Commit Graph

24 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
Måns Rullgård
ffd31cfef3 base64: improve documentation
Originally committed as revision 23905 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-30 20:09:32 +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
Howard Chu
31878fcf43 Add AV_BASE64_SIZE() macro
Originally committed as revision 23461 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-04 01:15:07 +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
Stefano Sabatini
74afdc5535 Document the av_base64_encode/decode functions.
See the thread:
"[PATCH] Improve documentation for libavutil/base64.h".

Originally committed as revision 17074 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 21:23:15 +00:00
Stefano Sabatini
ac76729c10 Cosmetics: "* out" -> "*out" for consistency with the other
parameters.

Originally committed as revision 17072 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 21:19:04 +00:00
Stefano Sabatini
5118bd441d Cosmetics: rename the "size" parameter of av_base64_encode() to "in_size".
Originally committed as revision 17071 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 21:16:36 +00:00
Stefano Sabatini
52ef50a080 Cosmetics: prefer out/in over buf/src for the parameter names of
av_base64_encode(), for consistency/readability reasons.

Originally committed as revision 17069 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 21:13:11 +00:00
Stefano Sabatini
61ccbc52ea Cosmetics: consistently prefer "size" over "len"/"length" for the
variable names.

Originally committed as revision 17067 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 21:08:42 +00:00
Diego Biurrun
bfe3676feb spelling/grammar/consistency review part II
Originally committed as revision 16848 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-28 23:03:17 +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
Luca Abeni
e76e2bbc09 Mark the source buffer as "const"
Originally committed as revision 10877 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-30 15:32:52 +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
Guillaume Poirier
efb775777f add a comment to indicate which #endif belong to which #define
Originally committed as revision 9356 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-17 18:59:28 +00:00
Måns Rullgård
699b3f99d0 add multiple inclusion guards to headers
Originally committed as revision 9345 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-17 00:01:30 +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
Luca Barbato
bd03c380ce expose av_base64_decode and av_base64_encode
Originally committed as revision 8448 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-19 00:48:47 +00:00
Luca Barbato
558b86a5d0 Reverting stray commit part II, r8156 had the base64 export patch mixed with the nutdec patch
Originally committed as revision 8158 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-28 03:40:23 +00:00
Luca Barbato
9fca9c0316 Reverting stray commit part I
Originally committed as revision 8157 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-28 03:37:54 +00:00
Luca Barbato
bb0eb714bd get_packetheader() forgot to read the header_checksum in big packets
patch from Clemens Ladisch cladisch AT fastmail dot net
(stray base64 patch reverted in the next commits)

Originally committed as revision 8156 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-28 03:28:31 +00:00
Carl Eugen Hoyos
034ef0e8c3 Move base64.[ch] to libavutil.
patch by Carl Eugen Hoyos, cehoyos ag.or at

Originally committed as revision 7963 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-13 08:21:47 +00:00