1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Go to file
Michael Niedermayer ae9b468b08 Merge commit 'c829b35c08ad8e1df45cca1cd12f084cf1183d07'
* commit 'c829b35c08ad8e1df45cca1cd12f084cf1183d07':
  lavc: er: remove unused variable size

No change as the variable is used

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-18 19:52:44 +01:00
compat Merge remote-tracking branch 'qatar/master' 2014-03-10 12:05:02 +01:00
doc doc/examples: Add example transcoding.c 2014-03-17 20:56:33 +01:00
libavcodec Merge remote-tracking branch 'qatar/master' 2014-03-18 14:08:40 +01:00
libavdevice Merge remote-tracking branch 'cigaes/master' 2014-03-08 15:00:36 +01:00
libavfilter avfilter/src_movie: Check that the pixel format hasnt changed 2014-03-18 03:59:20 +01:00
libavformat ff_put_wav_header: remove manual byte counting 2014-03-18 15:54:37 +01:00
libavresample Merge remote-tracking branch 'qatar/master' 2014-02-22 21:12:02 +01:00
libavutil Merge commit '1481d24c3a0abf81e1d7a514547bd5305232be30' 2014-03-17 14:41:13 +01:00
libpostproc
libswresample swresample: reuse COMMON_CORE asm where possible 2014-03-18 16:08:34 +01:00
libswscale Merge commit '1481d24c3a0abf81e1d7a514547bd5305232be30' 2014-03-17 14:41:13 +01:00
presets
tests Fix TARGET_SAMPLES and TARGET_PATH for some fate tests. 2014-03-18 01:29:50 +01:00
tools tools/build_libstagefright: switch git urls to https 2014-03-12 23:07:00 +01:00
.gitignore Merge commit 'e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a' 2014-02-25 20:26:00 +01:00
arch.mak Merge commit 'b4dd424d96f09f9bafb88e47f37df65dc4529143' 2014-03-13 22:35:47 +01:00
Changelog Changelog: move post 2.2 branching entries out of the 2.2 changelog 2014-03-16 19:15:58 +01:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c avconv: Match stream id 2014-03-13 11:59:34 +01:00
cmdutils.h
common.mak Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90' 2014-02-17 02:22:01 +01:00
configure doc/examples: Add example transcoding.c 2014-03-17 20:56:33 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c ffmpeg_opt: check that a subtitle encoder is available before auto mapping streams 2014-03-16 15:15:02 +01:00
ffmpeg_vdpau.c
ffmpeg.c ffmpeg: fix printing INT64_MIN pts at the end 2014-03-16 06:26:40 +01:00
ffmpeg.h Merge commit '67f2a688143b644f99360565a9f36c61a5f052e9' 2014-02-24 21:08:19 +01:00
ffplay.c ffplay: display information on stream cycling 2014-03-12 00:32:38 +01:00
ffprobe.c
ffserver.c
INSTALL
library.mak Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90' 2014-02-17 02:22:01 +01:00
LICENSE
MAINTAINERS MAINTAINERS: add myself az mpegts demuxer maintainer 2014-03-18 02:05:44 +01:00
Makefile Merge commit 'b4dd424d96f09f9bafb88e47f37df65dc4529143' 2014-03-13 22:35:47 +01:00
README
RELEASE Prepare for 11_alpha1 Release 2014-03-13 08:24:11 -04: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.