1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Go to file
Michael Niedermayer 53feab7a4e Merge commit '9047491f8bcd87673eed55fb310647a03b0981e9'
* commit '9047491f8bcd87673eed55fb310647a03b0981e9':
  swscale: add nv12/nv21->yuv420 converter

Conflicts:
	libswscale/rgb2rgb.c
	libswscale/rgb2rgb_template.c

See: ef627bf9ec
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-21 21:55:20 +01:00
compat
doc examples/filtering_audio,video: drop call to avcodec_get_frame_defaults() 2014-01-21 20:08:36 +01:00
libavcodec Merge commit 'e0ab5078a7d865f8f6fd6a6d3cbe0f380ead4a3d' 2014-01-21 21:26:13 +01:00
libavdevice
libavfilter lavfi/dualinput: fix shortest option. 2014-01-19 17:13:36 +01:00
libavformat lavf/segment: drop pointless variable oc from seg_write_packet() 2014-01-21 20:08:36 +01:00
libavresample Merge remote-tracking branch 'qatar/master' 2014-01-15 15:49:22 +01:00
libavutil lavu/rational: add syntactic sugar. 2014-01-19 17:12:22 +01:00
libpostproc
libswresample swresample: Add arm&x86 clobber tests 2014-01-18 18:38:57 +01:00
libswscale Merge commit '9047491f8bcd87673eed55fb310647a03b0981e9' 2014-01-21 21:55:20 +01:00
presets
tests fate: add a few tests for >8bpc ffvhuff 2014-01-21 03:20:39 +01:00
tools Merge commit '87acd33c092ab9e7d73686627e9105d99c1e4928' 2014-01-17 14:38:33 +01:00
.gitignore examples: add remuxing example 2014-01-20 13:10:10 +01:00
arch.mak
Changelog webp: fix capitalization of the word Exif 2014-01-15 02:54:36 +01:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c
cmdutils.h
common.mak
configure Move add/diff_int16 to lossless_videodsp 2014-01-20 21:32:47 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg_vdpau.c
ffmpeg.c ffmpeg: change ost->finished to an enum 2014-01-17 23:57:02 +01:00
ffmpeg.h ffmpeg: change ost->finished to an enum 2014-01-17 23:57:02 +01:00
ffplay.c
ffprobe.c
ffserver.c
INSTALL
library.mak
LICENSE Change license of yadif from GPL to LGPL 2014-01-14 14:19:15 +01:00
MAINTAINERS
Makefile
README
RELEASE Prepare for 10_alpha2 Release 2014-01-18 10:27:27 -05: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.