Michael Niedermayer 23c1db9b83 Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  avconv: use different variables for decoded and filtered frame.
  avconv: add support for copying attachments.
  matroskaenc: write attachments.
  matroskadec: export mimetype of attachments as metadata.
  avconv: factorize common code from new_*_stream()
  doc/avconv: expand documentation for some options.
  doc/avconv: document -timelimit.

Conflicts:
	avconv.c
	cmdutils.c
	tests/codec-regression.sh

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

2011-09-28 02:07:44 +02:00

..

examples

examples/muxing.c: apply misc style fixes

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

APIchanges

lavu: add av_x_if_null().

2011-09-22 00:22:52 +02:00

avconv.texi

Merge remote-tracking branch 'qatar/master'

2011-09-28 02:07:44 +02:00

avtools-common-opts.texi

Merge remote-tracking branch 'qatar/master'

2011-09-28 02:07:44 +02:00

avutil.txt

Remove unused softfloat implementation.

2011-05-11 13:43:30 +02:00

bitstream_filters.texi

Revert "replace FFmpeg with Libav in doc/"

2011-03-17 17:26:45 +01:00

build_system.txt

Revert some silly renamings that leaked in from a pull.

2011-03-29 02:27:13 +02:00

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-09-21 21:25:43 +02:00

encoders.texi

doc: fix x264_opts/x264opts typo.

2011-09-16 11:50:06 +02:00

eval.texi

eval: implement not() expression

2011-09-19 12:38:34 +02:00

faq.texi

Merge remote-tracking branch 'qatar/master'

2011-09-12 00:32:54 +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

Include authorship information from ffmpeg-mt at Ronald S. Bultjes request.

2011-04-19 01:17:59 +02:00

ffmpeg.texi

doc/ffmpeg: s/avserver/ffserver/

2011-09-13 23:52:43 +02:00

ffplay.texi

ffplay.texi: document -codec

2011-09-27 22:00:20 +02:00

ffprobe.texi

ffprobe: add JSON output printing format.

2011-09-13 23:03:05 +02:00

ffserver.conf

Rename ffserver to avserver.

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

ffserver.texi

Merge remote-tracking branch 'qatar/master'

2011-09-12 00:32:54 +02:00

filters.texi

vf_drawtext: make x and y options parametric

2011-09-24 12:36:48 +02:00

general.texi

libaac+ support

2011-09-26 02:28:21 +02:00

git-howto.txt

fix typo

2011-04-10 04:31:54 +02:00

indevs.texi

lavdev/lavfi: add audio support

2011-09-16 21:22:05 +02:00

issue_tracker.txt

doc: issue tracking: explain the term issue

2011-09-02 23:08:03 +02:00

libavfilter.texi

Remove reference to the libavfilter soc SVN repo, update libavfilter status description

2011-09-10 23:40:52 +02:00

Makefile

build: create output directories as needed

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

metadata.texi

Revert "replace FFmpeg with Libav in doc/"

2011-03-17 17:26:45 +01:00

multithreading.txt

Revert "replace FFmpeg with Libav in doc/"

2011-03-17 17:26:45 +01:00

muxers.texi

Merge remote-tracking branch 'qatar/master'

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

optimization.txt

fix another forgotten mplayerhq.hu link

2011-04-08 01:35:43 +02:00

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

The definition of rate and distortion is not conditional of lambda being

2009-03-30 10:39:20 +00:00

RELEASE_NOTES

release_notes: document not fully understood mingw-sdl issue

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

snow.txt

Use a consistent capitalization for 'Snow' as discussed on the list

2008-02-08 19:17:46 +00:00

soc.txt

Revert "replace FFmpeg with Libav in doc/"

2011-03-17 17:26:45 +01:00

swscale.txt

Update SW scaler doc after libswscale commit 30841.

2010-03-05 08:34:31 +00:00

t2h.init

doc: modify style for texi2html 1.78+

2011-01-30 03:41:47 +01:00

tablegen.txt

Update tablegen documentation for WRITE_ARRAY macro.

2010-06-27 14:31:50 +00:00

texi2pod.pl

doc: replace @pxref by @ref where appropriate

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

viterbi.txt

Quick description of the Viterbi algorithm so I do not have to repeat it

2009-03-03 15:35:20 +00:00