1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-03 05:10:03 +02:00
Go to file
Michael Niedermayer 1bcfb1eea8 Merge commit '6d8629aac13692447b54eac795bf74007ebf8987'
* commit '6d8629aac13692447b54eac795bf74007ebf8987':
  aac: K&R formatting cosmetics

Conflicts:
	libavcodec/aacdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-28 10:00:51 +02:00
compat
doc examples/muxing: rename audio/video_pts to audio/video_time 2013-06-26 23:38:42 +02:00
libavcodec Merge commit '6d8629aac13692447b54eac795bf74007ebf8987' 2013-06-28 10:00:51 +02:00
libavdevice avdevice/x11grab: allocate just one Cursor 2013-06-21 12:00:11 +02:00
libavfilter avfilter/vf_mp: preserve pixel format when possible 2013-06-28 03:32:00 +02:00
libavformat gxf: Added codec ID to playback AVCHD 2013-06-27 18:13:45 +02:00
libavresample
libavutil avutil/ripemd: adjust loop condition to silence CID1035716 2013-06-22 14:52:29 +02:00
libpostproc postprocess_template: put rsp on the clobber list to prevent gcc from using it in "q" 2013-06-16 18:21:39 +02:00
libswresample swresample/x86/audio_convert: add emms to CONV 2013-06-18 02:26:36 +02:00
libswscale swscale: Fix PAL8 input with alpha 2013-06-26 15:14:00 +02:00
presets
tests fate: Add Canopus Lossless YUY2 test 2013-06-25 11:26:23 +02:00
tools
.gitignore
arch.mak
Changelog lavfi: add spp filter. 2013-06-14 01:27:22 +02:00
cmdutils_common_opts.h
cmdutils.c cmdutils: dont change the log level for -report 2013-06-24 02:59:05 +02:00
cmdutils.h
common.mak
configure Require pthreads for compilation with OpenCL support. 2013-06-26 09:46:09 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg.c Merge commit '42cc6cefd315c1556e2a52f7ebe2f766ec82b790' 2013-06-23 12:56:55 +02:00
ffmpeg.h
ffplay.c ffplay: simplify and fix flushing out old subtitles on seeking 2013-06-26 22:30:16 +02:00
ffprobe.c ffprobe: always exit 1 in case of errors 2013-06-27 00:20:36 +02:00
ffserver.c
INSTALL
library.mak
LICENSE lavfi: add spp filter. 2013-06-14 01:27:22 +02:00
MAINTAINERS Add maintainer for WebVTT demuxer and muxer 2013-06-18 18:02:30 +02:00
Makefile
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.