Commit Graph

142 Commits

Author SHA1 Message Date
Michael Niedermayer
411cc5c46a Merge remote-tracking branch 'qatar/master'
* qatar/master: (31 commits)
  audioconvert: add explanatory comments to channel_names array
  audioconvert: K&R whitespace cosmetics
  avconv: use correct index when selecting metadata to write to.
  avconv: fix inverted variable
  doc/avconv: document option types (input/output/per-stream/...)
  doc/avtools-common-opts: write a section about stream specifiers.
  doc/avconv: remove two pointless paragraphs.
  doc/avconv: document that global options should be specified first.
  doc/avconv: remove entries for nonexistent options
  doc/avconv: remove documentation for removed 'timestamp' option
  doc: cosmetics, rename fftools-common-opts to avtools-....
  avconv: move streamid_map to options context.
  avconv: extend -vf syntax
  avconv: move top_field_first to options context.
  avconv: move inter/intra matrix to options context.
  avconv: remove -psnr option.
  avconv: remove me_threshold option.
  avconv: move video_rc_override_string to options context.
  avconv: move frame pixel format to the options context.
  avconv: move frame aspect ratio to the options context.
  ...

Conflicts:
	avconv.c
	cmdutils_common_opts.h
	doc/avconv.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-12 00:32:54 +02:00
Luca Barbato
d162994a81 doc: explain __STDC_CONSTANT_MACROS in C++
In order to build C++ programs using libav you need
-D__STDC_CONSTANT_MACROS appened to the CXXFLAGS.
2011-09-10 15:21:22 -04:00
Michael Niedermayer
bb258fb995 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  doc: Improve references to external URLs.
  h264: move decode_mb_skip() from h264.h to h.264_mvpred.h
  ffplay: skip return value of avcodec_decode_video2 / avcodec_decode_subtitle2
  dnxhdenc: Replace a forward declaration by the proper #include.
  h264: move h264_mvpred.h include.
  pix_fmt: Fix number of bits per component in yuv444p9be
  lavf: deprecate AVFormatContext.timestamp
  ffmpeg: merge input_files_ts_scale into InputStream.
  ffmpeg: don't abuse a global for passing sample format from input to output
  ffmpeg: don't abuse a global for passing channel layout from input to output
  ffmpeg: factor common code from new_a/v/s/d_stream to new_output_stream()
  matroskaenc: make SSA default subtitle codec.
  oggdec: prevent heap corruption.

Conflicts:
	doc/developer.texi
	doc/faq.texi
	doc/general.texi
	ffmpeg.c
	ffplay.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-13 00:42:11 +02:00
Diego Biurrun
2cb6dec61c doc: Improve references to external URLs.
Sometimes it makes sense to replace a raw URL with some informative text
that links to the URL instead of using the raw URL itself in the text.
Also transform some mailing list references into links.
2011-07-12 23:42:20 +02:00
Michael Niedermayer
7b376b398a Merge remote branch 'qatar/master'
* qatar/master:
  Handle unicode file names on windows
  rtp: Rename the open/close functions to alloc/free
  Lowercase all ff* program names.
  Refer to ff* tools by their lowercase names.
NOT Pulled  Replace more FFmpeg instances by Libav or ffmpeg.
  Replace `` by $() syntax in shell scripts.
  patcheck: Allow overiding grep program(s) through environment variables.
NOT Pulled  Remove stray libavcore and _g binary references.
  vorbis: Rename decoder/encoder files to follow general file naming scheme.
  aacenc: Fix whitespace after last commit.
  cook: Fix small typo in av_log_ask_for_sample message.
  aacenc: Finish 3GPP psymodel analysis for non mid/side cases.
  Remove RDFT dependency from AAC decoder.
  Add some debug log messages to AAC extradata
  Fix mov debug (u)int64_t format strings.
  bswap: use native types for av_bwap16().
  doc: FLV muxing is supported.
  applehttp: Handle AES-128 encrypted streams
  Add a protocol handler for AES CBC decryption with PKCS7 padding
  doc: Mention that DragonFly BSD requires __BSD_VISIBLE set

Conflicts:
	ffplay.c
	ffprobe.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-24 03:41:22 +02:00
Diego Biurrun
3a50894eaa Refer to ff* tools by their lowercase names. 2011-04-23 19:12:23 +02:00
Diego Biurrun
d11818eff4 Remove now obsolete references to _g-suffixed binaries.
Automatic stripping of binaries was removed in commit e0be794
and the _g binaries disappeared along with it.
2011-04-18 23:55:11 +02:00
Lou Logan
70ff55733d Replace outdated info on the FAQ
FAQ could use some work. This updates a few little details.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-04-10 10:07:49 +02:00
Lou Logan
f7f9e24d09 Replace outdated info on the FAQ
FAQ could use some work. This updates a few little details.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-09 03:23:49 +02:00
Ramiro Polla
c6c2dfcf15 Remove arrozcru URL from documentation
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-03-27 12:07:55 +02:00
Michael Niedermayer
8ea36711b0 Merge remote-tracking branch 'newdev/master'
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Not Pulled:
    commit 42cfb3835b
    Author: Mans Rullgard <mans@mansr.com>
    Date:   Mon Feb 28 18:06:58 2011 +0000

        Remove Sonic experimental audio codec

    commit 2912e87a6c
    Author: Mans Rullgard <mans@mansr.com>
    Date:   Fri Mar 18 17:35:10 2011 +0000

        Replace FFmpeg with Libav in licence headers
2011-03-19 20:05:11 +01:00
Janne Grunau
faa6f1c306 get rid of the last svn mentions 2011-03-18 21:57:38 +01:00
Michael Niedermayer
a6be21d3ba Revert "replace FFmpeg with Libav in doc/"
This reverts commit f8a45fa1b1.

Conflicts:

	doc/optimization.txt
2011-03-17 17:26:45 +01:00
Michael Niedermayer
0fecf2642b Merge remote-tracking branch 'newdev/master'
Conflicts:
	Changelog
	doc/APIchanges
	doc/optimization.txt
	libavformat/avio.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-17 17:22:52 +01:00
Janne Grunau
f8a45fa1b1 replace FFmpeg with Libav in doc/
unless it stands for ffmpeg the program or is historic
2011-03-16 22:01:01 +01:00
Johan Andersson
21de920472 Update the url to the site website and change ffmpeg-devel to libav-devel
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-13 18:45:29 -04:00
Tilman Brock
ee028bbde9 Fix spelling error.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit b08f59dca4)
2011-02-14 23:59:55 +01:00
Tilman Brock
b08f59dca4 Fix spelling error.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-14 12:20:14 -05:00
Stefano Sabatini
c906d974b7 Fix script command in a FAQ entry
In the FAQ section "How do I encode single pictures into movies?", use
-s for generating symbolic links with the ln command.

The script was generating hard links, which is not likely what it was
supposed to do.

Fix issue 2488.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit e063f5886b)
2011-02-13 00:54:06 +01:00
Stefano Sabatini
e063f5886b Fix script command in a FAQ entry
In the FAQ section "How do I encode single pictures into movies?", use
-s for generating symbolic links with the ln command.

The script was generating hard links, which is not likely what it was
supposed to do.

Fix issue 2488.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-12 13:17:09 +00:00
Janne Grunau
5231d6277f doc: modify style for texi2html 1.78+
The generated HTML files are similar to the ones generated with
texi2html 1.56k used on the website.

Tested with texi2html 1.78 and 5.0. 1.78 is the minimal recommended
version.

The removed @sp from the titlepage section were ignored until
texi2html 5.0. If not removed the pages generated by 5.0 will have ugly
empty space around the title.
(cherry picked from commit a8f0814a74)
2011-01-30 03:41:47 +01:00
Janne Grunau
a8f0814a74 doc: modify style for texi2html 1.78+
The generated HTML files are similar to the ones generated with
texi2html 1.56k used on the website.

Tested with texi2html 1.78 and 5.0. 1.78 is the minimal recommended
version.

The removed @sp from the titlepage section were ignored until
texi2html 5.0. If not removed the pages generated by 5.0 will have ugly
empty space around the title.
2011-01-29 16:57:29 +01:00
Stefano Sabatini
4c74d1660c Fix typo, -flags 4mv => -flags mv4.
Originally committed as revision 25326 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-03 17:15:18 +00:00
Diego Biurrun
12002cae59 Remove outdated entries about bt8x8 capture on Linux 2.4 kernels.
Originally committed as revision 24324 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-19 09:13:56 +00:00
Diego Biurrun
008a44ef8b Mark URL as such with texinfo markup.
Originally committed as revision 24323 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-19 08:56:55 +00:00
Diego Biurrun
2c880fe101 Clarify bug reporting policy with regard to releases.
Originally committed as revision 24322 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-19 08:41:47 +00:00
Diego Biurrun
e7f6c252a2 Mark file references as such with texinfo markup.
Originally committed as revision 24321 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-19 08:34:38 +00:00
Diego Biurrun
675e737917 Remove duplicate RTP depacketization entry.
Two questions below there is the same Q+A, slightly rephrased.

Originally committed as revision 24320 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-19 07:52:12 +00:00
Diego Biurrun
387fe82c95 Fix URL for ffv1, msmpeg4, asv1, 4xm docs.
Originally committed as revision 24304 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-18 14:01:33 +00:00
Ramiro Polla
95b98f82b2 faq: remove note that says avisynth "has just been added". it has been there
for almost 4 years.

Originally committed as revision 24162 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-10 15:25:42 +00:00
Stefano Sabatini
9c16add67b Replace not anymore valid syntax "-title X" with "-metadata title=X".
Originally committed as revision 22062 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-25 19:38:54 +00:00
John Van Sickle
49f6402236 Improve section 3.2 of the faq by providing more useful examples and a
simple batch script to rename images to a numerical sequence.

Patch by John Van Sickle printf("%s.%s@%s.com", john, vansickle, gmail).

Originally committed as revision 21330 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-19 22:05:02 +00:00
Stefano Sabatini
54c5848dbd Remove extra empty line.
Originally committed as revision 21120 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-10 10:40:45 +00:00
John Van Sickle
7659712749 Fix entry on concatenating multiple yuv4mpegpipe streams.
patch by John Van Sickle, john.vansickle gmail com

Originally committed as revision 21033 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-06 13:49:31 +00:00
Daniel Verkamp
21600a7774 AC-3 decoder is no longer GPL; update FAQ
Originally committed as revision 20776 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-08 21:18:40 +00:00
Aurelien Jacobs
b250f9c66d Change semantic of CONFIG_*, HAVE_* and ARCH_*.
They are now always defined to either 0 or 1.

Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-13 23:44:16 +00:00
Diego Biurrun
0fa5f24c3b Change mplayerhq.hu references to ffmpeg.org where appropriate.
Originally committed as revision 16310 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-25 15:49:50 +00:00
Diego Biurrun
c8b4365258 Remove entry about unsupported QCELP codec, it is now supported.
Originally committed as revision 15988 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-03 13:45:41 +00:00
Stefano Sabatini
cd0e37d3b1 Replaces not the anymore valid -flags +trell option with -trellis 2.
Originally committed as revision 15954 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-29 13:58:41 +00:00
Víctor Paesa
d9fe7eb385 Fix spelling
Originally committed as revision 15666 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-22 18:07:35 +00:00
Víctor Paesa
242a2b7eca Fix issue 68:
Warn that the forum look is no excuse from following the FFmpeg netiquette.

Originally committed as revision 15639 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-18 22:03:21 +00:00
Ramiro Polla
ab5ce4aeae Update link to FFmpeg Windows Help website.
Originally committed as revision 15312 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-13 18:50:53 +00:00
Daniel Serpell
084cadabbc Add an example of higher resolution video encoding for the PSP to the FAQ.
patch by Daniel Serpell, dserpell gmail com

Originally committed as revision 14760 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-14 15:23:07 +00:00
Daniel Serpell
b96e074dc7 Fix the PSP examples in the FAQ to use libx264 as codec instead of h264.
patch by Daniel Serpell, dserpell gmail com

Originally committed as revision 14759 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-14 15:16:17 +00:00
Diego Biurrun
5b43368de9 Add note about gcc bugs that gcc devs refuse to fix.
Originally committed as revision 14464 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-29 07:55:51 +00:00
Diego Biurrun
f278709c4f typo fix
Originally committed as revision 14426 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-27 12:36:58 +00:00
Diego Biurrun
831ec93567 Run documentation through ispell, plus some minor fixes.
Originally committed as revision 13670 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-06 07:51:36 +00:00
Diego Biurrun
a28d9122d2 Add a note about everybody's favorite recurring gcc bug:
error: can't find a register in class 'GENERAL_REGS' while reloading 'asm'

Originally committed as revision 13496 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-28 16:12:40 +00:00
Diego Biurrun
842eabc5f9 cosmetics: XviD is now called Xvid.
Originally committed as revision 13465 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-27 12:32:59 +00:00
Diego Biurrun
2cab640129 typo fixes
Originally committed as revision 12428 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-12 23:58:46 +00:00