FFmpeg git repo
Go to file
Michael Niedermayer 581b5f0b9b Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e'
* commit 'e3fcb14347466095839c2a3c47ebecff02da891e':
  dsputil: Split off IDCT bits into their own context

Conflicts:
	configure
	libavcodec/aic.c
	libavcodec/arm/Makefile
	libavcodec/arm/dsputil_init_arm.c
	libavcodec/arm/dsputil_init_armv6.c
	libavcodec/asvdec.c
	libavcodec/dnxhdenc.c
	libavcodec/dsputil.c
	libavcodec/dvdec.c
	libavcodec/dxva2_mpeg2.c
	libavcodec/intrax8.c
	libavcodec/mdec.c
	libavcodec/mjpegdec.c
	libavcodec/mjpegenc_common.h
	libavcodec/mpegvideo.c
	libavcodec/ppc/dsputil_altivec.h
	libavcodec/ppc/dsputil_ppc.c
	libavcodec/ppc/idctdsp.c
	libavcodec/x86/Makefile
	libavcodec/x86/dsputil_init.c
	libavcodec/x86/dsputil_mmx.c
	libavcodec/x86/dsputil_x86.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-01 15:22:11 +02:00
compat
doc Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e' 2014-07-01 15:22:11 +02:00
libavcodec Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e' 2014-07-01 15:22:11 +02:00
libavdevice avdevice/xv: fix missing { 2014-06-30 21:32:19 +02:00
libavfilter Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e' 2014-07-01 15:22:11 +02:00
libavformat avformat/hdsenc: Use av_mallocz_array() 2014-06-30 05:08:33 +02:00
libavresample
libavutil Merge commit '7b0c7c9163fe3dd0081696befde28617119d2590' 2014-06-28 21:31:18 +02:00
libpostproc
libswresample swr: convert resample_common/linear_int16_mmx2/sse2 to yasm. 2014-06-30 20:11:50 +02:00
libswscale
presets
tests avcodec/cavs: improve conformance with rm52j reference decoder 2014-06-28 19:53:41 +02:00
tools
.gitignore
arch.mak
Changelog
cmdutils_common_opts.h
cmdutils_opencl.c cmdutils_opencl: Use av_malloc_array() 2014-07-01 03:49:36 +02:00
cmdutils.c cmdutils: ignore sws_flags if swscale is not enabled 2014-06-29 17:27:23 +02:00
cmdutils.h
common.mak
configure Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e' 2014-07-01 15:22:11 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_dxva2.c
ffmpeg_filter.c
ffmpeg_opt.c ffmpeg_opt: route -ab to -b:a 2014-06-29 02:47:49 +02:00
ffmpeg_vda.c
ffmpeg_vdpau.c
ffmpeg.c ffmpeg: fix deadlock regression in threading error handing 2014-06-27 17:45:38 +02:00
ffmpeg.h
ffplay.c ffplay: decrease audio_diff_threshold 2014-06-24 21:59:21 +02:00
ffprobe.c ffprobe: add color_range and color_space to stream output 2014-06-24 00:35:16 +02:00
ffserver.c
INSTALL.md
library.mak
LICENSE.md
MAINTAINERS
Makefile
README.md
RELEASE
version.sh

FFmpeg README

  1. Documentation

  1. Licensing

  • See the LICENSE file.
  1. Build and Install

  • See the INSTALL file.