1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-07 11:13:41 +02:00
Go to file
Michael Niedermayer 59bf303d68 Merge remote-tracking branch 'newdev/master'
* newdev/master:
  ac3enc: avoid memcpy() of exponents and baps in EXP_REUSE case by using exponent reference blocks.
  Chronomaster DFA decoder
DUPLICATE:  framebuffer device demuxer
NOT MERGED: cosmetics: fix dashed line length after 070c5d0
  http: header field names are case insensitive

Conflicts:
	LICENSE
	README
	doc/indevs.texi
	libavdevice/fbdev.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-29 02:46:11 +02:00
doc Merge remote-tracking branch 'newdev/master' 2011-03-29 02:46:11 +02:00
ffpresets Update qmin/qmax values for libx264 presets 2011-02-08 15:59:30 -08:00
libavcodec Merge remote-tracking branch 'newdev/master' 2011-03-29 02:46:11 +02:00
libavdevice Merge remote-tracking branch 'newdev/master' 2011-03-29 02:46:11 +02:00
libavfilter mp: extend syntax, make it accept mp=filter=params 2011-03-28 22:50:09 +02:00
libavformat Merge remote-tracking branch 'newdev/master' 2011-03-29 02:46:11 +02:00
libavutil Fix apparently exploitable race condition. 2011-03-25 02:24:32 +01:00
libpostproc Merge remote-tracking branch 'newdev/master' 2011-03-19 20:05:11 +01:00
libswscale Fix compilation failure with runtime cpudetect (Ticket #22) 2011-03-28 16:46:45 +02:00
mt-work Merge remote-tracking branch 'ffmpeg-mt/master' 2011-03-25 02:51:20 +01:00
tests Merge remote-tracking branch 'newdev/master' 2011-03-27 01:40:18 +01:00
tools patcheck: warn about assert usage 2011-03-18 18:49:36 +01:00
.gitignore consolidate .gitignore patters into a single file 2011-01-18 21:32:05 +01:00
Changelog Merge remote-tracking branch 'newdev/master' 2011-03-29 02:46:11 +02:00
cmdutils_common_opts.h
cmdutils.c cmdutils: remove list_fmts(), simplify 2011-03-26 14:40:30 +01:00
cmdutils.h cmdutils: remove list_fmts(), simplify 2011-03-26 14:40:30 +01:00
common.mak Merge libavcore into libavutil 2011-02-15 16:18:21 +01:00
configure framebuffer device demuxer 2011-03-28 16:49:22 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
Doxyfile Merge remote-tracking branch 'newdev/master' 2011-03-19 20:05:11 +01:00
ffmpeg.c ffmpeg: warns the user when the selected pixel format is ignored 2011-03-27 15:53:45 +02:00
ffplay.c ffplay: Don't assume ic->pb is non-null 2011-03-21 15:08:09 -04:00
ffprobe.c ffprobe: provide format parameters to av_open_input_file() 2011-03-26 14:41:51 +01:00
ffserver.c avio: deprecate url_open_buf 2011-03-16 22:59:39 -04:00
ffserver.h
INSTALL Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
LICENSE cosmetics: fix dashed line length after 070c5d0 2011-03-28 09:53:40 +02:00
MAINTAINERS Add crystalhd maintainer 2011-03-29 02:27:13 +02:00
Makefile Merge remote-tracking branch 'newdev/master' 2011-03-24 02:16:11 +01:00
README cosmetics: fix dashed line length after 070c5d0 2011-03-28 09:53:40 +02:00
subdir.mak
version.sh Merge remote-tracking branch 'newdev/master' 2011-03-19 20:05:11 +01:00

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.