1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Go to file
Michael Niedermayer 75f8f70221 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  h264: allow cropping to AVCodecContext.width/height
  mov: set AVCodecContext.width/height for h264
  iac: generate codec tables as they are supposed to be
  indeo4: handle frame type 1 properly
  lavu: change versioning script to include all av* prefixed symbols

Conflicts:
	libavcodec/h264.c
	libavutil/libavutil.v

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-09 20:30:17 +02:00
doc buffersrc: accept the frame rate as argument. 2012-06-09 08:42:50 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2012-06-09 20:30:17 +02:00
libavdevice avdevice: bump soname due to lavf soname bump 2012-05-25 12:22:21 +02:00
libavfilter buffersrc: deprecate flat options syntax. 2012-06-09 08:42:50 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-06-09 20:30:17 +02:00
libavresample Merge remote-tracking branch 'qatar/master' 2012-05-30 19:32:06 +02:00
libavutil Merge remote-tracking branch 'qatar/master' 2012-06-09 20:30:17 +02:00
libpostproc libpostproc: fix out of array accesses detected by AddressSanitizer. 2012-02-29 04:25:13 +01:00
libswresample swr: skip memset(0) in rematrix when the array is known to be already 0 2012-06-09 02:43:10 +02:00
libswscale colorspace-test: add few more tests 2012-06-09 14:38:51 +00:00
mt-work
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests fate-bprint: try to workaround platform specific value. 2012-06-08 12:16:31 +02:00
tools tools/graph2dot: factorize code printing non-media specific link information 2012-06-06 23:20:02 +02:00
.gitignore doc/examples: add programs to .gitignore. 2012-05-12 19:58:33 +02:00
arch.mak build: Consistently handle conditional compilation for all optimization OBJS. 2012-04-12 09:00:49 +02:00
Changelog Merge remote-tracking branch 'qatar/master' 2012-06-06 01:08:33 +02:00
cmdutils_common_opts.h cmdutils: fix -fdebug without -v xy 2012-04-05 21:50:50 +02:00
cmdutils.c cmdutils: include threading caps in codecs listing. 2012-06-07 23:19:20 +02:00
cmdutils.h Merge remote-tracking branch 'qatar/master' 2012-06-06 01:08:33 +02:00
common.mak Merge remote-tracking branch 'qatar/master' 2012-05-05 20:22:09 +02:00
configure Add iac build dependency. 2012-06-08 15:29:24 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1 cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
COPYING.LGPLv3
CREDITS
Doxyfile remove avconv from Doxyfile 2012-01-25 22:47:45 +01:00
ffmpeg.c ffmpeg: fix fate breakage introduced by key=value buffersrc args. 2012-06-09 14:02:27 +02:00
ffplay.c ffplay: fix return value of get_video_frame if avcodec_decode_video fails 2012-06-09 19:45:10 +02:00
ffprobe.c ffprobe: show packet duration in frame 2012-06-06 23:26:04 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2012-05-06 21:53:19 +02:00
INSTALL
library.mak Merge remote-tracking branch 'qatar/master' 2012-03-26 20:52:52 +02:00
LICENSE Remove libpostproc. 2012-02-23 19:36:16 +01:00
MAINTAINERS MAINTAINERS: update versions 2012-05-24 21:15:01 +02:00
Makefile doc/examples: install them with the shared data. 2012-05-19 12:28:59 +02:00
README README: be a tiny bit more verbose 2012-04-06 10:23:26 +02:00
RELEASE RELEASE: bump to current version (0.10.2). 2012-03-26 22:47:28 +02:00
version.sh

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.