FFmpeg git repo
Go to file
Michael Niedermayer 876d1d796b Merge remote-tracking branch 'qatar/master'
* qatar/master:
  vp6: partially propagate huffman tree building errors during coeff model parsing and fix misspelling
  mpeg12: propagate chunk decode errors and fix conditional indentation
  vc1: fix VC-1 Pulldown handling.
  VC1: Fix first/last row checks with slices
  mp4: Handle non-trivial ES Descriptors.
  vc1: properly zero coded_block[] edges on new slice entry.

Conflicts:
	libavcodec/vc1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-08-26 01:29:40 +02:00
doc Merge remote-tracking branch 'qatar/master' 2011-08-23 18:26:37 +02:00
ffpresets
libavcodec Merge remote-tracking branch 'qatar/master' 2011-08-26 01:29:40 +02:00
libavdevice lavdev/lavfi: set sample aspect ratio in the output stream/codec context 2011-08-21 15:27:09 +02:00
libavfilter lavfi: rename vsrc_movie.c to src_movie.c 2011-08-23 15:45:53 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2011-08-26 01:29:40 +02:00
libavutil lavu: add av_get_media_type_string() convenience function 2011-08-20 14:20:25 +02:00
libpostproc
libswscale sws: use shift for chroma sample up convertion 2011-08-25 14:49:29 +02:00
mt-work
tests sws: use shift for chroma sample up convertion 2011-08-25 14:49:29 +02:00
tools
.gitignore lavc: add a table of all codecs names. 2011-08-22 10:54:44 +02:00
avconv.c Merge remote-tracking branch 'qatar/master' 2011-08-24 20:26:48 +02:00
Changelog Merge remote-tracking branch 'qatar/master' 2011-08-23 18:26:37 +02:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak Merge remote-tracking branch 'qatar/master' 2011-08-15 23:35:53 +02:00
configure Merge remote-tracking branch 'qatar/master' 2011-08-23 18:26:37 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg.c ffmpeg: use avcodec_get_name to report missing en/decoders. 2011-08-22 12:13:27 +02:00
ffplay.c ffplay: use lock manager callback to make libavcodec thread-safe 2011-08-25 04:06:09 +02:00
ffprobe.c ffprobe: use av_get_media_type_string() in media_type_string(), simplify 2011-08-20 14:20:25 +02:00
ffserver.c
INSTALL
LICENSE
MAINTAINERS
Makefile
README
RELEASE
subdir.mak
version.sh

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.