1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Go to file
Michael Niedermayer 1f5e5d2205 Merge commit 'ba13606ca6adbc74b4db4a72b0769397d6408791'
* commit 'ba13606ca6adbc74b4db4a72b0769397d6408791':
  fate: Add a --target-samples path parameter

Conflicts:
	configure
	tests/fate/audio.mak
	tests/fate/cover-art.mak
	tests/fate/demux.mak
	tests/fate/ea.mak
	tests/fate/filter-video.mak
	tests/fate/h264.mak
	tests/fate/image.mak
	tests/fate/lossless-audio.mak
	tests/fate/lossless-video.mak
	tests/fate/microsoft.mak
	tests/fate/pcm.mak
	tests/fate/prores.mak
	tests/fate/qt.mak
	tests/fate/real.mak
	tests/fate/screen.mak
	tests/fate/video.mak
	tests/fate/voice.mak
	tests/fate/vpx.mak
	tests/fate/vqf.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-29 04:25:37 +02:00
compat os2threads: move from lavc to compat/ 2013-05-28 12:49:20 +02:00
doc lavfi: add haldclut filter. 2013-05-27 20:42:28 +02:00
libavcodec Merge commit '4a27a52a1f74016095b7aee1b4a422cf62217ade' 2013-05-29 04:02:23 +02:00
libavdevice
libavfilter lavfi/drawutils: attempt to fix subsampling. 2013-05-28 19:20:27 +02:00
libavformat tta: make probing more robust 2013-05-28 11:46:10 +00:00
libavresample
libavutil Merge remote-tracking branch 'qatar/master' 2013-05-27 08:55:24 +02:00
libpostproc
libswresample
libswscale
presets
tests Merge commit 'ba13606ca6adbc74b4db4a72b0769397d6408791' 2013-05-29 04:25:37 +02:00
tools
.gitignore
arch.mak
Changelog Merge commit '728214992e3698305550c1762f973d2ac567f016' 2013-05-29 03:28:18 +02:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure Merge commit 'ba13606ca6adbc74b4db4a72b0769397d6408791' 2013-05-29 04:25:37 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg.c ffmpeg: use actual packet pts when discarding for the copypriorss option 2013-05-28 17:03:23 -04:00
ffmpeg.h
ffplay.c ffplay: dont forget passing lowres to private options 2013-05-28 00:09:34 +02:00
ffprobe.c
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS
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.