Michael Niedermayer 69a6eddd60 Merge commit 'f2960097e42ddf9a356bab6547f87906f6999e0a' ...

* commit 'f2960097e42ddf9a356bab6547f87906f6999e0a':
  bink: fix a check for the first frame.
  doc/developer: Drop obsolete MPlayer reference
  doc/developer: Add ISC license to list of acceptable licenses
  doc/developer: Add web links for all suggested licenses

Conflicts:
	doc/developer.texi

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

2013-02-01 14:15:30 +01:00

..

doxy

…

examples

examples/demuxing: free AVPacket after usage

2013-01-15 23:37:30 +01:00

APIchanges

Merge commit '38c1466ca41c73c7ce347da702362cb69c151716'

2013-01-26 13:34:30 +01:00

authors.texi

doc: use a common authors.texi file blurb

2012-12-19 09:33:43 +01:00

avtools-common-opts.texi

doc: remove inclusion of libav* documentation in tools

2012-12-20 23:48:23 +01:00

avutil.txt

…

bitstream_filters.texi

…

build_system.txt

…

decoders.texi

doc/decoders: fix typo in "@Options"

2012-12-06 10:16:10 +01:00

default.css

doc/default.css: use ffmpeg.org website CSS

2012-12-22 00:38:48 +01:00

demuxers.texi

lavf: TED Talks JSON captions demuxer.

2012-12-09 18:50:38 +01:00

developer.texi

Merge commit 'f2960097e42ddf9a356bab6547f87906f6999e0a'

2013-02-01 14:15:30 +01:00

doxy-wrapper.sh

…

Doxyfile

Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3'

2012-12-21 17:32:52 +01:00

encoders.texi

Merge commit 'ded3673d77943c376d94e8157b1238bbd1eeca2d'

2013-01-26 14:18:48 +01:00

errno.txt

…

eval.texi

doc/eval: sort functions by name

2013-01-31 12:12:15 +01:00

faq.texi

doc/faq: fill missing word in the concat protocol entry

2013-01-25 00:04:22 +01:00

fate_config.sh.template

…

fate.texi

…

ffmpeg-bitstream-filters.texi

doc: extend "See Also" chapters in component manuals

2012-12-19 09:33:44 +01:00

ffmpeg-codecs.texi

doc: extend "See Also" chapters in component manuals

2012-12-19 09:33:44 +01:00

ffmpeg-devices.texi

doc: extend "See Also" chapters in component manuals

2012-12-19 09:33:44 +01:00

ffmpeg-filters.texi

doc: extend "See Also" chapters in component manuals

2012-12-19 09:33:44 +01:00

ffmpeg-formats.texi

lavf: clarify/extend documentation for AVFormatContext::analyzeduration

2013-01-13 15:09:09 +01:00

ffmpeg-protocols.texi

doc: extend "See Also" chapters in component manuals

2012-12-19 09:33:44 +01:00

ffmpeg-resampler.texi

doc: document aresample:first_pts

2013-01-22 01:38:55 +01:00

ffmpeg-scaler.texi

doc: extend "See Also" chapters in component manuals

2012-12-19 09:33:44 +01:00

ffmpeg-utils.texi

doc: extend "See Also" chapters in component manuals

2012-12-19 09:33:44 +01:00

ffmpeg.texi

ffmpeg: remove -crop* and -pad* options

2013-01-27 16:56:47 +01:00

ffmpeg.txt

…

ffplay.texi

ffplay: extend documentation for the -vf option

2013-01-13 16:03:13 +01:00

ffprobe.texi

doc: remove inclusion of libav* documentation in tools

2012-12-20 23:48:23 +01:00

ffprobe.xsd

ffprobe: show pkt_size in frame

2012-12-15 11:46:47 +01:00

ffserver.conf

Merge commit 'bf5f46b4cc47b7a4568119f224057d4ff91b6cdd'

2012-11-16 13:07:10 +01:00

ffserver.texi

doc/ffserver: remove painfully outdated "What do I need?" section

2013-01-12 10:53:22 +01:00

filter_design.txt

lavfi: replace filter_samples by filter_frame

2012-11-28 16:43:34 +01:00

filters.texi

doc/filters: fix afade cuve types listing

2013-01-31 16:18:50 +00:00

general.texi

EVRC decoder

2013-01-21 10:24:45 +00:00

git-howto.texi

…

git-howto.txt

…

indevs.texi

doc/indevs: document v4l2 options

2013-01-31 22:13:08 +01:00

issue_tracker.txt

…

libavcodec.texi

doc: extend "See Also" chapters in library manuals

2012-12-19 09:33:44 +01:00

libavdevice.texi

doc: extend "See Also" chapters in library manuals

2012-12-19 09:33:44 +01:00

libavfilter.texi

doc: extend "See Also" chapters in library manuals

2012-12-19 09:33:44 +01:00

libavformat.texi

doc: extend "See Also" chapters in library manuals

2012-12-19 09:33:44 +01:00

libavutil.texi

doc: extend "See Also" chapters in library manuals

2012-12-19 09:33:44 +01:00

libswresample.texi

doc: extend "See Also" chapters in library manuals

2012-12-19 09:33:44 +01:00

libswscale.texi

doc: extend "See Also" chapters in library manuals

2012-12-19 09:33:44 +01:00

Makefile

Merge commit '7a95afe433b2a692f490b98948c082e62ffc1d27'

2013-01-24 14:35:15 +01:00

metadata.texi

…

mips.txt

mips: Optimization of AC3 FP encoder and EAC3 FP decoder

2012-11-19 22:24:44 +01:00

multithreading.txt

…

muxers.texi

lavf/img2enc: extend current options documentation

2013-01-25 00:04:23 +01:00

nut.texi

Drop Snow codec

2013-01-06 16:30:02 +01:00

optimization.txt

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

outdevs.texi

…

platform.texi

The c99-to-c89 binaries are now hosted on videolan.org.

2013-01-14 16:28:44 +01:00

print_options.c

…

protocols.texi

doc/protocols: document HTTP protocol cookie support

2013-01-15 22:26:44 +01:00

rate_distortion.txt

miscellaneous typo fixes

2012-12-21 00:18:34 +01:00

RELEASE_NOTES

Merge commit 'b14e89b3c5e6d7f6401a2ff1e3d198fa902e988a'

2013-01-05 13:27:59 +01:00

snow.txt

Drop Snow codec

2013-01-06 16:30:02 +01:00

soc.txt

…

swresample.txt

…

swscale.txt

…

syntax.texi

…

t2h.init

Merge commit 'f90ff772e7e35b4923c2de429d1fab9f2569b568'

2013-01-27 13:32:56 +01:00

tablegen.txt

…

texi2pod.pl

doc/texi2pod: fix warnings introduced in e7e14bc69a606a6bec82efef729263cd38f122d4

2013-01-26 15:12:57 +01:00

viterbi.txt

miscellaneous typo fixes

2012-12-21 00:18:34 +01:00