1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Go to file
Michael Niedermayer 58c03f6d7d Merge remote branch 'qatar/master'
* qatar/master:
  swscale: properly inline bits/endianness in yuv2yuvX16inC().
(We didnt pull the bug)  swscale: fix clipping of 9/10bit YUV420P.
  Add av_clip_uintp2() function
(our patch / duplicate)  dfa: fix buffer overflow checks to avoid integer overflows.
(our patch / duplicate)  movenc: always write esds descriptor length using 4 bytes.
(our patch / duplicate)  ffmpeg: use parse_number_and_die() when it makes sense
(No thanks)  ffmpeg: get rid of the 'q' key schizofrenia

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-14 02:19:58 +02:00
doc configure: Do not unconditionally add -D_POSIX_C_SOURCE to CPPFLAGS. 2011-05-12 11:41:59 +02:00
ffpresets Remove now useless ffpresets for x264, use -preset 2011-04-16 16:59:39 -07:00
libavcodec Merge remote branch 'qatar/master' 2011-05-14 02:19:58 +02:00
libavdevice Merge remote branch 'qatar/master' 2011-05-13 04:40:40 +02:00
libavfilter Merge remote branch 'qatar/master' 2011-05-09 04:50:56 +02:00
libavformat udp: switch custom fifo to libavutil fifo. 2011-05-13 17:43:17 +02:00
libavutil Merge remote branch 'qatar/master' 2011-05-14 02:19:58 +02:00
libpostproc Merge remote branch 'qatar/master' 2011-05-09 04:50:56 +02:00
libswscale Merge remote branch 'qatar/master' 2011-05-14 02:19:58 +02:00
mt-work Merge remote-tracking branch 'ffmpeg-mt/master' 2011-03-30 02:58:38 +02:00
tests movenc: always write esds descriptor length using 4 bytes. 2011-05-13 07:38:54 +02:00
tools patcheck: warn about assert usage 2011-05-12 13:02:58 +02:00
.gitignore Remove stray libavcore and _g binary references. 2011-04-23 14:23:20 +02:00
Changelog ffmpeg: get rid of the 'q' key schizofrenia 2011-05-13 07:38:54 +02:00
cmdutils_common_opts.h Implement a -pix_fmts option for listing all the supported pixel 2009-12-21 21:53:03 +00:00
cmdutils.c Allocate per codec options, now that options are freed between inputs and outputs. 2011-05-10 16:42:52 -07:00
cmdutils.h Merge remote branch 'qatar/master' 2011-05-04 04:06:26 +02:00
common.mak Merge remote-tracking branch 'newdev/master' 2011-04-01 02:58:15 +02:00
configure UDP: udp depends on pthreads now 2011-05-13 17:49:00 +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: use parse_number_and_die() when it makes sense 2011-05-13 07:38:54 +02:00
ffplay.c Merge remote branch 'qatar/master' 2011-05-13 04:40:40 +02:00
ffprobe.c ffprobe: tweak error message in open_input_file() 2011-05-12 13:03:10 +02:00
ffserver.c Merge remote branch 'qatar/master' 2011-05-13 04:40:40 +02:00
ffserver.h
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
LICENSE Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
MAINTAINERS add MicroDVD muxer and demuxer 2011-04-04 01:29:40 +02:00
Makefile Makefile:Put lost tab back. 2011-05-06 02:21:52 +02:00
README Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
subdir.mak Revert "Remove support for stripping executables" 2011-04-01 00:24:12 +02:00
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.