Michael Niedermayer 41bf67d8d4 Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  movenc: change AV_LOG_INFO to AV_LOG_WARNING for some warnings
  avconv: remove a write-only variable
  avconv: remove pointless parameter from new_*_stream().
  avconv: cosmetics, move code
  avconv: cosmetics -- move copy_chapters().
  avconv: cosmetics -- move parse_forced_key_frames().
  lavc: add audio flag to the 'b' option, deprecate 'ab'.
  avconv: rename sameq to same_quant
  doc/avconv: add forgotten end of chapter.
  Changelog: document avconv incompatibilities with ffmpeg.
  avconv: replace -vcodec/-acodec/-scodec with a better system.
  avconv: remove presets.
  svq3: propagate codec memory allocation failure in context init

Conflicts:
	Changelog
	avconv.c
	libavcodec/options.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2011-08-16 23:47:35 +02:00

..

examples

examples/muxing.c: apply misc style fixes

2011-07-27 02:05:49 +02:00

APIchanges

fifo: add av_fifo_peek2(), and deprecate av_fifo_peek()

2011-08-14 01:56:28 +02:00

avconv.texi

Merge remote-tracking branch 'qatar/master'

2011-08-16 23:47:35 +02:00

avutil.txt

…

bitstream_filters.texi

…

build_system.txt

…

decoders.texi

decoders.texi: fix typos in rawvideo section

2011-05-20 10:14:00 +02:00

demuxers.texi

Rename ffplay to avplay.

2011-08-09 19:56:21 +02:00

developer.texi

Merge remote-tracking branch 'qatar/master'

2011-08-15 23:35:53 +02:00

encoders.texi

doc: cosmetics: libx264 typos

2011-06-02 14:43:29 +02:00

eval.texi

eval: add support for pow() function

2011-06-07 00:37:00 +02:00

faq.texi

Merge remote-tracking branch 'qatar/master'

2011-07-13 00:42:11 +02:00

fate.txt

fate.txt: replace FATE rsync command with a make command

2011-05-27 10:41:46 +02:00

ffmpeg-mt-authorship.txt

…

ffmpeg.texi

Rename ffserver to avserver.

2011-08-09 19:56:25 +02:00

ffplay.texi

Rename ffplay to avplay.

2011-08-09 19:56:21 +02:00

ffprobe.texi

Rename ffprobe to avprobe.

2011-08-09 19:56:24 +02:00

ffserver.conf

Rename ffserver to avserver.

2011-08-09 19:56:25 +02:00

ffserver.texi

Rename ffserver to avserver.

2011-08-09 19:56:25 +02:00

fftools-common-opts.texi

Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925'

2011-08-13 02:56:08 +02:00

filters.texi

vf_unsharp: set default chroma size value to 5x5

2011-08-14 16:29:44 +02:00

general.texi

Rename ffserver to avserver.

2011-08-09 19:56:25 +02:00

git-howto.txt

…

indevs.texi

indevs.texi: fix typo (builf -> build)

2011-08-11 17:32:54 +02:00

issue_tracker.txt

doc: Remove outdated information about our issue tracker

2011-07-01 20:53:45 +02:00

libavfilter.texi

Rename ffplay to avplay.

2011-08-09 19:56:21 +02:00

Makefile

build: create output directories as needed

2011-06-29 09:14:56 +01:00

metadata.texi

…

multithreading.txt

…

muxers.texi

Merge remote-tracking branch 'qatar/master'

2011-07-10 04:28:50 +02:00

optimization.txt

…

outdevs.texi

sdl: use the filename for defining the window title, if not specified

2011-06-05 13:17:38 +02:00

protocols.texi

Rename ffplay to avplay.

2011-08-09 19:56:21 +02:00

rate_distortion.txt

…

RELEASE_NOTES

release_notes: document not fully understood mingw-sdl issue

2011-06-21 20:58:39 +02:00

snow.txt

…

soc.txt

…

swscale.txt

…

t2h.init

…

tablegen.txt

…

texi2pod.pl

doc: replace @pxref by @ref where appropriate

2011-07-09 21:53:59 +02:00

viterbi.txt

…