FFmpeg git repo
Go to file
Michael Niedermayer 4c8bc6fdee Merge commit 'e96c3b81cadd0ba84d43b1f3a54980df3785d9a5'
* commit 'e96c3b81cadd0ba84d43b1f3a54980df3785d9a5':
  avutil: rename AV_PIX_FMT_Y400A to AV_PIX_FMT_YA8

Conflicts:
	libavcodec/libopenjpegdec.c
	libavcodec/libopenjpegenc.c
	libavcodec/raw.c
	libavutil/pixdesc.c
	libavutil/pixfmt.h
	libavutil/version.h
	libswscale/swscale_internal.h
	libswscale/swscale_unscaled.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-04 21:48:00 +02:00
compat
doc Merge commit 'e96c3b81cadd0ba84d43b1f3a54980df3785d9a5' 2014-08-04 21:48:00 +02:00
libavcodec Merge commit 'e96c3b81cadd0ba84d43b1f3a54980df3785d9a5' 2014-08-04 21:48:00 +02:00
libavdevice
libavfilter Merge commit '1ef9e8376466bb1e2c147e47554b94cab9c8b04a' 2014-08-04 06:11:34 +02:00
libavformat avformat/util: change av_find_default_stream_index() to use a score based system 2014-08-04 18:06:26 +02:00
libavresample Merge commit 'fbc0b8659967ea54a8472b5f795270d38bb085dd' 2014-08-04 02:49:48 +02:00
libavutil Merge commit 'e96c3b81cadd0ba84d43b1f3a54980df3785d9a5' 2014-08-04 21:48:00 +02:00
libpostproc
libswresample swresample/swresample: Treat mono as planar 2014-08-04 03:05:05 +02:00
libswscale Merge commit 'e96c3b81cadd0ba84d43b1f3a54980df3785d9a5' 2014-08-04 21:48:00 +02:00
presets
tests Merge commit '23dfa00b88fc927d4c1854ab4fc60f5c6398f3ac' 2014-08-04 14:23:46 +02:00
tools
.gitignore
arch.mak
Changelog libavformat: Add Icecast protocol 2014-08-04 13:33:44 +02:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c
cmdutils.h
common.mak
configure Merge commit 'eb9244f20210fd420fb9b3c98126f9cae525d1cc' 2014-08-04 14:14:13 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_dxva2.c
ffmpeg_filter.c
ffmpeg_opt.c ffmpeg: Do not fail if a demuxer and decoder use the same option identifer 2014-08-04 13:33:44 +02:00
ffmpeg_vda.c
ffmpeg_vdpau.c
ffmpeg.c ffmpeg: Do not fail if a demuxer and decoder use the same option identifer 2014-08-04 13:33:44 +02:00
ffmpeg.h ffmpeg: Do not fail if a demuxer and decoder use the same option identifer 2014-08-04 13:33:44 +02:00
ffplay.c
ffprobe.c
ffserver.c ffserver: initialize pbuffer in prepare_sdp_description() 2014-08-02 18:32:37 +02:00
INSTALL.md
library.mak
LICENSE.md
MAINTAINERS
Makefile
README.md
RELEASE
RELEASE_NOTES
version.sh

FFmpeg README

  1. Documentation

  1. Licensing

  • See the LICENSE file.
  1. Build and Install

  • See the INSTALL file.