1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Go to file
Michael Niedermayer e40d92b1e4 Merge commit '59388dac69f9a79eddb003d1c6aad5ec89d4287b'
* commit '59388dac69f9a79eddb003d1c6aad5ec89d4287b':
  fate: update tests for YVYU422 pixel format

Conflicts:
	tests/ref/fate/filter-pixdesc
	tests/ref/fate/filter-pixfmts-copy
	tests/ref/fate/filter-pixfmts-null
	tests/ref/fate/filter-pixfmts-scale
	tests/ref/fate/filter-pixfmts-vflip

No change as the fate tests where updated in the merges that changed
the scores

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-09 04:16:35 +02:00
compat
doc Merge commit '8b17243d1742279bcb2368f8d325ea71e66736c8' 2014-04-09 03:07:47 +02:00
libavcodec Merge commit 'b6a09ef700786b4e1e871dfa0f5c386ea43bbd0a' 2014-04-09 04:06:35 +02:00
libavdevice pulseaudio: move NULL check up before dereference. 2014-04-06 19:38:51 +02:00
libavfilter avfilter/vf_colormatrix: fix memleak on error 2014-04-08 01:25:00 +02:00
libavformat rawvideo: Support decoding YVYU422 FourCC 2014-04-08 23:24:36 +02:00
libavresample Merge commit '01c5779f56cf708e6cb88b11cfdc248cae7e2ee8' 2014-04-05 19:16:39 +02:00
libavutil Merge commit '8b17243d1742279bcb2368f8d325ea71e66736c8' 2014-04-09 03:07:47 +02:00
libpostproc
libswresample swresample/resample: use av_malloc_array() where appropriate 2014-04-08 00:29:26 +02:00
libswscale Merge commit '92b099daf4b8ef93513e38b43899cb8458a2fde3' 2014-04-09 03:36:38 +02:00
presets
tests Merge commit 'b6a09ef700786b4e1e871dfa0f5c386ea43bbd0a' 2014-04-09 04:06:35 +02:00
tools
.gitignore
arch.mak Merge commit '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14' 2014-04-07 02:15:18 +02:00
Changelog libtwolame MP2 encoding support 2014-04-07 23:50:33 +02:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c cmdutils: use av_mallocz_array() 2014-04-08 15:44:32 +02:00
cmdutils.h
common.mak
configure configure: AVI demux needs exif 2014-04-08 20:14:49 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg_vdpau.c
ffmpeg.c
ffmpeg.h
ffplay.c
ffprobe.c
ffserver.c ffserver: don't hardcode RTSP status codes 2014-04-07 00:24:00 -03:00
INSTALL
library.mak
LICENSE
MAINTAINERS
Makefile Merge commit '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14' 2014-04-07 02:15:18 +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.