Go to file
Michael Niedermayer f9a2d0c3fe Merge remote-tracking branch 'qatar/master'
* qatar/master: (23 commits)
  avconv: Reformat s16 volume adjustment.
  ARM: NEON optimised vector_fmac_scalar()
  dca: use vector_fmac_scalar from dsputil
  dsputil: add vector_fmac_scalar()
  latmenc: Fix private options
  vf_unsharp: store hsub/vsub in the filter context
  vf_unsharp: adopt a more natural order of params in apply_unsharp()
  vf_unsharp: rename method "unsharpen" to "apply_unsharp"
  vf_scale: apply the same transform to the aspect during init that is applied per frame
  vf_pad: fix "vsub" variable value computation
  vf_scale: add a "sar" variable
  lavfi: fix realloc size computation in avfilter_add_format()
  vsrc_color: use internal timebase
  lavfi: fix signature for avfilter_graph_parse() and avfilter_graph_config()
  graphparser: prefer void * over AVClass * for log contexts
  avfiltergraph: use meaningful error codes
  avconv: Initialize return value for codec copy path.
  fate: use 'run' helper for seek-test
  fate: remove seek-mpeg2reuse test
  Fix memory (re)allocation in matroskadec.c, related to MSVR-11-0080.
  ...

Conflicts:
	doc/filters.texi
	libavfilter/avfilter.h
	libavfilter/avfiltergraph.c
	libavfilter/avfiltergraph.h
	libavfilter/graphparser.c
	libavfilter/vf_scale.c
	libavfilter/vsrc_color.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-29 01:11:01 +02:00
doc Merge remote-tracking branch 'qatar/master' 2011-09-29 01:11:01 +02:00
ffpresets remove libx264 lossless presets 2011-09-26 22:04:23 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2011-09-29 01:11:01 +02:00
libavdevice Merge remote-tracking branch 'qatar/master' 2011-09-24 22:39:52 +02:00
libavfilter Merge remote-tracking branch 'qatar/master' 2011-09-29 01:11:01 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2011-09-29 01:11:01 +02:00
libavutil Introduce av_realloc_f. 2011-09-28 18:13:52 +02:00
libpostproc postproc: fix compilation failure, now really 2011-09-24 01:51:35 +02:00
libswresample swresample: remove unused variable. 2011-09-28 16:11:01 +02:00
libswscale Merge remote-tracking branch 'qatar/master' 2011-09-25 23:30:25 +02:00
mt-work Update todo 2011-06-12 18:01:29 +02:00
tests Merge remote-tracking branch 'qatar/master' 2011-09-29 01:11:01 +02:00
tools graph2dot: show timebase information for audio links 2011-09-17 01:36:32 +02:00
.gitignore gitignore: add libswresample* 2011-09-19 17:39:38 +02:00
avconv.c Merge remote-tracking branch 'qatar/master' 2011-09-29 01:11:01 +02:00
Changelog Merge remote-tracking branch 'qatar/master' 2011-09-27 02:14:37 +02:00
cmdutils_common_opts.h Merge remote-tracking branch 'qatar/master' 2011-09-12 00:32:54 +02:00
cmdutils.c Merge remote-tracking branch 'qatar/master' 2011-09-28 02:07:44 +02:00
cmdutils.h Merge remote-tracking branch 'qatar/master' 2011-09-27 02:14:37 +02:00
common.mak Add libswresample. 2011-09-19 07:04:17 +02:00
configure Merge remote-tracking branch 'qatar/master' 2011-09-27 02:14:37 +02:00
COPYING.GPLv2 Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1. 2009-06-05 09:51:31 +00:00
COPYING.GPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
COPYING.LGPLv2.1 Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1. 2009-06-05 09:51:31 +00:00
COPYING.LGPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
CREDITS Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
Doxyfile doxygen: dont generate docs for avconv.c 2011-09-08 17:56:17 +02:00
ffmpeg.c Merge remote-tracking branch 'qatar/master' 2011-09-29 01:11:01 +02:00
ffplay.c ffplay: fix forgotten codec_name checks 2011-09-28 03:19:22 +02:00
ffprobe.c ffprobe: fix trailing '=' in stream id. 2011-09-28 17:57:22 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2011-09-27 02:14:37 +02:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
LICENSE libaac+ support 2011-09-26 02:28:21 +02:00
MAINTAINERS MAINTAINERS: loose svn reference 2011-09-23 19:18:58 +02:00
Makefile Add libswresample. 2011-09-19 07:04:17 +02:00
README Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
RELEASE RELEASE: set to 0.8.4.git after the release from 2011-09-22 2011-09-27 21:32:17 +02:00
subdir.mak Merge remote-tracking branch 'qatar/master' 2011-07-31 00:34:47 +02:00
version.sh version.sh: handle shallow clones and snapshots. 2011-07-22 10:43:59 +02:00

FFmpeg README
-------------

1) Documentation
----------------

* Read the documentation in the doc/ directory.

2) Licensing
------------

* See the LICENSE file.