1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Go to file
Michael Niedermayer cf7d3846fc Merge commit '9de9b828ef005dec37052548c195a6b4f18fc701'
* commit '9de9b828ef005dec37052548c195a6b4f18fc701':
  lavc: don't overwrite display dimensions with coded dimensions.
  lavc: extend / update the [coded_]{width,height} doxy

Conflicts:
	libavcodec/avcodec.h
	libavcodec/utils.c

The change to the w/h handling is not merged as it breaks lowres

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 15:42:32 +02:00
compat Provide local copies of AviSynth's and AvxSynth's requisite headers in compat/avisynth/. 2013-03-21 04:23:24 +01:00
doc lavfi/asetnsamples: switch to an AVOptions-based system. 2013-04-11 15:40:15 +02:00
libavcodec Merge commit '9de9b828ef005dec37052548c195a6b4f18fc701' 2013-04-11 15:42:32 +02:00
libavdevice lavd/v4l2: fully init an ioctl argument. 2013-04-01 10:38:14 +02:00
libavfilter lavfi/asetnsamples: switch to an AVOptions-based system. 2013-04-11 15:40:15 +02:00
libavformat mxfdec: update current edit unit when seeking in mxf files without index tables 2013-04-11 13:35:58 +02:00
libavresample Merge commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa' 2013-03-28 11:20:41 +01:00
libavutil opencl: add spec opencl device APIs 20130411 2013-04-11 12:46:34 +02:00
libpostproc lavfi/pp: switch to an AVOptions-based system. 2013-04-10 23:16:03 +02:00
libswresample
libswscale Replace all occurrences of PRI in sscanf() calls with SCN 2013-04-10 09:56:48 +02:00
presets
tests fate: add tests for unknown channel layouts. 2013-04-11 13:09:33 +02:00
tools Replace all occurrences of PRI in sscanf() calls with SCN 2013-04-10 09:56:48 +02:00
.gitignore Merge commit 'a862c7d3368241e72a465ab944afa38ea62a6640' 2013-04-06 13:23:38 +02:00
arch.mak
Changelog telecine filter 2013-04-11 11:12:39 +00:00
cmdutils_common_opts.h cmdutils_common_opts: fix loglevel help text as its inaccurate 2013-03-31 18:06:18 +02:00
cmdutils.c cmdutils: remove error message from opt_default() in case of missing option 2013-04-05 10:48:32 +02:00
cmdutils.h cmdutils: avtool -> fftool 2013-03-31 18:22:23 +02:00
common.mak Integrate lcov/gcov into Libav 2013-04-05 18:55:11 +02:00
configure Merge remote-tracking branch 'qatar/master' 2013-04-11 12:32:29 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c ffmpeg/avformat: factor av_guess_frame_rate() out 2013-03-29 17:40:28 +01:00
ffmpeg_opt.c ffmpeg: use a rational for -aspect option. 2013-04-09 20:16:20 +02:00
ffmpeg.c ffmpeg: update error message, and make use of av_err2str() to simplify 2013-04-10 18:02:00 +02:00
ffmpeg.h ffmpeg: use a rational for -aspect option. 2013-04-09 20:16:20 +02:00
ffplay.c ffplay: simplify video pts calculation 2013-04-08 22:21:45 +02:00
ffprobe.c ffprobe: set writer context to 0 after allocation 2013-03-19 18:00:34 +01:00
ffserver.c ffserver/ctime1: avoid using strcpy() 2013-03-25 23:31:34 +01:00
INSTALL
library.mak Merge commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975' 2013-03-28 12:12:38 +01:00
LICENSE LICENSE: add libutvideo in the GPL libraries list. 2013-03-29 02:08:20 +01:00
MAINTAINERS MAINTAINERS: add opencl maintainer 2013-04-11 13:42:07 +02:00
Makefile Merge commit 'a862c7d3368241e72a465ab944afa38ea62a6640' 2013-04-06 13:23:38 +02:00
README
RELEASE
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.