Go to file
Michael Niedermayer 3c1326411d Merge commit '37045e422903695e610cca6ecb753df643ab9380'
* commit '37045e422903695e610cca6ecb753df643ab9380':
  mpegvideo: drop vismv code

Conflicts:
	libavcodec/mpegvideo.c

vismv code works fine, and thus only the unused fields are droped

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12 12:57:54 +01:00
compat Use the avstring.h locale-independent character type functions 2013-03-07 15:16:36 +02:00
doc Merge commit '759001c534287a96dc96d1e274665feb7059145d' 2013-03-12 03:23:28 +01:00
libavcodec Merge commit '37045e422903695e610cca6ecb753df643ab9380' 2013-03-12 12:57:54 +01:00
libavdevice lavd/v4l2: simplify code 2013-03-09 16:59:13 +01:00
libavfilter lavfi/moviesrc: use refcounted frames 2013-03-12 03:23:57 +01:00
libavformat mpegts: clear avprograms only for removed programs 2013-03-10 02:28:05 +01:00
libavresample Merge commit '45235ac488363e3360bf2f2275102d1ec66eba0f' 2013-02-24 17:45:06 +01:00
libavutil buffer: use the atomic get instead of the add and fetch variant. 2013-03-12 12:12:49 +01:00
libpostproc Fix libpostproc compilation on x86_32 with disable-optimizations. 2013-02-09 15:03:04 +01:00
libswresample buildsys: only include log2_tab per library for shared builds 2013-03-04 12:25:02 +01:00
libswscale swscale: Add support for unscaled 8-bit Packed RGB -> Planar RGB 2013-02-27 09:51:43 -05:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests Merge commit '2eba9087f3031c6050f8dcd996225490be6c2410' 2013-03-12 12:49:59 +01:00
tools lavu: add escape API 2013-03-07 01:12:04 +01:00
.gitignore tools: add seek_print. 2013-02-24 13:12:46 +01:00
arch.mak Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30' 2012-12-08 14:24:16 +01:00
Changelog lavfi: add curves filter. 2013-03-10 03:00:10 +01:00
cmdutils_common_opts.h cmdutils: implement debug/fdebug log level update differently. 2012-12-20 02:38:18 +01:00
cmdutils.c cmdutils: remove conditionnal pp include. 2013-03-11 03:55:23 +01:00
cmdutils.h ffmpeg: use a AVDictionary instead of the context to move swr parameters around 2013-02-24 20:31:56 +01:00
common.mak Merge commit '4cc4b33f71d3982df404fceb4405d656c538bc74' 2013-02-24 15:24:38 +01:00
configure atomic: Check for __sync_val_compare_and_swap instead of __sync_synchronize 2013-03-12 10:41:02 +01:00
COPYING.GPLv2 Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1. 2009-06-05 09:51:31 +00:00
COPYING.GPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
COPYING.LGPLv2.1 cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
COPYING.LGPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
CREDITS CREDITS: redirect to Git log, remove current outdated content 2013-01-31 18:02:52 +01:00
ffmpeg_filter.c ffmpeg: port sub2video to AVFrame. 2013-03-10 13:45:15 +01:00
ffmpeg_opt.c ffmpeg: add the -canvas_size option. 2013-03-10 13:48:49 +01:00
ffmpeg.c ffmpeg: re-enable use of buffersrc flags. 2013-03-10 14:07:29 +01:00
ffmpeg.h ffmpeg: add the -canvas_size option. 2013-03-10 13:48:49 +01:00
ffplay.c ffplay: use AVFrame accessor functions 2013-03-01 23:22:08 +01:00
ffprobe.c ffprobe: use AVFrame accessor functions 2013-03-01 23:18:22 +01:00
ffserver.c Remove incorrect use of ctype.h functions. 2013-03-03 21:44:10 +01:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
library.mak build: fixes a "can't cd to..." issue when installing shared libraries. 2013-02-15 08:39:35 +01:00
LICENSE lavfi: port MP stereo3d filter 2013-03-05 18:36:40 +00:00
MAINTAINERS MAINTAINERS: update for 1.2 2013-03-08 14:45:26 +01:00
Makefile build: Add proper infrastructure for adding and checking host CPPFLAGS 2013-02-23 20:23:45 +01:00
README README: be a tiny bit more verbose 2012-04-06 10:23:26 +02:00
RELEASE RELEASE: 1.1.git for master 2013-01-06 21:42:35 +01:00
version.sh version.sh: handle shallow clones and snapshots. 2011-07-22 10:43:59 +02:00

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.