1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Go to file
Michael Niedermayer 0424e052f8 Merge remote-tracking branch 'ffmpeg-mt/master'
* ffmpeg-mt/master:
      Update todo.
      h264: add an assert that copied pictures are valid picture pointers
      valgrind-check: run with 1 and 3 threads
      h264: When decoding a packet with multiple PPS/SPS, don't start the next thread until all of them have been read
      Allow some pictures to be released earlier after 51ead6d2c40c5defdd211f435aec49b19f5f6a18
      h264: fix slice threading MC reading uninitialized frame edges.

    Please see ffmpeg-mt for a list of authors of these changes.

    Conflicts:
        libavcodec/h264.c
        mt-work/valgrind-check.sh

    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-21 03:11:50 +02:00
doc decoders.texi: fix typos in rawvideo section 2011-05-20 10:14:00 +02:00
ffpresets Merge remote-tracking branch 'qatar/master' 2011-05-18 05:42:42 +02:00
libavcodec Merge remote-tracking branch 'ffmpeg-mt/master' 2011-05-21 03:11:50 +02:00
libavdevice Merge remote branch 'qatar/master' 2011-05-13 04:40:40 +02:00
libavfilter vf_libopencv: prefer opencv/cxcore.h over cxtypes.h 2011-05-20 11:54:53 +02:00
libavformat Add a flag to disable side data merging. 2011-05-21 02:31:27 +02:00
libavutil eval: opensolaris strtod() cannot handle 0x1234 2011-05-18 00:01:40 +02:00
libpostproc Merge remote branch 'qatar/master' 2011-05-09 04:50:56 +02:00
libswscale swscale: fix compile on mingw32 2011-05-14 13:22:46 +02:00
mt-work Merge remote-tracking branch 'ffmpeg-mt/master' 2011-05-21 03:11:50 +02:00
tests Merge remote-tracking branch 'qatar/master' 2011-05-19 06:00:31 +02:00
tools Merge remote branch 'qatar/master' 2011-05-17 04:51:33 +02:00
.gitignore Merge remote-tracking branch 'qatar/master' 2011-05-20 05:48:22 +02:00
Changelog update changelog with 9/10 bit H264 and FFV1 changes 2011-05-16 23:30:41 -04:00
cmdutils_common_opts.h
cmdutils.c cmdutils: use const AVClass * when senseful 2011-05-20 10:05:14 +02:00
cmdutils.h Merge remote-tracking branch 'qatar/master' 2011-05-19 13:00:31 +02:00
common.mak Merge remote-tracking branch 'newdev/master' 2011-04-01 02:58:15 +02:00
configure vf_libopencv: prefer opencv/cxcore.h over cxtypes.h 2011-05-20 11:54:53 +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: remove useless NULL-check on avfilter_unref_buffer 2011-05-20 09:34:56 +02:00
ffplay.c Add support for request_sample_format in ffmpeg and ffplay. 2011-05-18 17:27:06 -04: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 Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
LICENSE cosmetics: fix dashed line length after 070c5d0 2011-03-28 09:53:40 +02:00
MAINTAINERS add MicroDVD muxer and demuxer 2011-04-04 01:29:40 +02:00
Makefile Merge remote-tracking branch 'qatar/master' 2011-05-19 06:00:31 +02:00
README cosmetics: fix dashed line length after 070c5d0 2011-03-28 09:53:40 +02: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.