1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Go to file
Michael Niedermayer dc1c79be1b Merge remote-tracking branch 'qatar/master'
* qatar/master:
  avfilter: Log an error if avfilter fails to configure a link.
  avconv: support only native pthreads.
  rtmp: Fix a possible access to invalid memory location when the playpath is too short.

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-12 20:44:57 +02:00
doc lavu/error: add av_make_error_string() and av_err2str() convenience utilities 2012-06-11 23:57:01 +02:00
libavcodec pngenc: use av_assert 2012-06-11 21:41:03 +02:00
libavdevice sdl: fix aspect ratio computations. 2012-06-10 09:57:50 +02:00
libavfilter Merge remote-tracking branch 'qatar/master' 2012-06-12 20:44:57 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-06-12 20:44:57 +02:00
libavresample Merge remote-tracking branch 'qatar/master' 2012-05-30 19:32:06 +02:00
libavutil lavu/error: add av_make_error_string() and av_err2str() convenience utilities 2012-06-11 23:57:01 +02:00
libpostproc postprocess: fix another void returning void function. 2012-06-10 18:26:16 +02:00
libswresample swr: mix_2_1_int16_mmx/sse 2012-06-12 17:49:12 +02:00
libswscale colorspace-test: add few more tests 2012-06-09 14:38:51 +00:00
mt-work
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests tests/parseutils: change test to make it platform independent 2012-06-11 23:35:31 +02:00
tools tools/graph2dot: factorize code printing non-media specific link information 2012-06-06 23:20:02 +02:00
.gitignore doc/examples: add programs to .gitignore. 2012-05-12 19:58:33 +02:00
arch.mak Optimization of AMR NB and WB decoders for MIPS 2012-06-11 21:12:39 +02:00
Changelog Merge remote-tracking branch 'qatar/master' 2012-06-06 01:08:33 +02:00
cmdutils_common_opts.h cmdutils: fix -fdebug without -v xy 2012-04-05 21:50:50 +02:00
cmdutils.c cmdutils: dont return void from a void function 2012-06-10 02:38:01 +02:00
cmdutils.h Merge remote-tracking branch 'qatar/master' 2012-06-06 01:08:33 +02:00
common.mak Merge remote-tracking branch 'qatar/master' 2012-05-05 20:22:09 +02:00
configure Optimization of AMR NB and WB decoders for MIPS 2012-06-11 21:12:39 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1 cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
COPYING.LGPLv3
CREDITS
Doxyfile remove avconv from Doxyfile 2012-01-25 22:47:45 +01:00
ffmpeg.c Merge remote-tracking branch 'qatar/master' 2012-06-12 20:44:57 +02:00
ffplay.c ffplay: fix return value of get_video_frame if avcodec_decode_video fails 2012-06-09 19:45:10 +02:00
ffprobe.c ffprobe: show packet duration in frame 2012-06-06 23:26:04 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2012-05-06 21:53:19 +02:00
INSTALL
library.mak Merge remote-tracking branch 'qatar/master' 2012-03-26 20:52:52 +02:00
LICENSE Remove libpostproc. 2012-02-23 19:36:16 +01:00
MAINTAINERS MAINTAINERS: update versions 2012-05-24 21:15:01 +02:00
Makefile Optimization of AMR NB and WB decoders for MIPS 2012-06-11 21:12:39 +02:00
README README: be a tiny bit more verbose 2012-04-06 10:23:26 +02:00
RELEASE RELEASE: bump to current version (0.10.2). 2012-03-26 22:47:28 +02:00
version.sh

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

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

* Read the documentation in the doc/ directory in git.
  You can also view it online at http://ffmpeg.org/documentation.html

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

* See the LICENSE file.

3) Build and Install
--------------------

* See the INSTALL file.