1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Go to file
Michael Niedermayer c1df467d73 Merge commit '835f798c7d20bca89eb4f3593846251ad0d84e4b'
* commit '835f798c7d20bca89eb4f3593846251ad0d84e4b':
  mpegvideo: cosmetics: Lowercase ugly uppercase MPV_ function name prefixes

Conflicts:
	libavcodec/h261dec.c
	libavcodec/intrax8.c
	libavcodec/mjpegenc.c
	libavcodec/mpeg12dec.c
	libavcodec/mpeg12enc.c
	libavcodec/mpeg4videoenc.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo.h
	libavcodec/mpegvideo_enc.c
	libavcodec/rv10.c
	libavcodec/x86/mpegvideoenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-15 20:11:56 +02:00
compat Merge commit '6baeadd11083774ebd823dd5e1a744c2150a3bfc' 2014-08-15 12:31:29 +02:00
doc lavfi/avf_showspectrum: add full frame sliding mode. 2014-08-14 14:59:23 +02:00
libavcodec Merge commit '835f798c7d20bca89eb4f3593846251ad0d84e4b' 2014-08-15 20:11:56 +02:00
libavdevice Merge commit 'a6a27fede94efe48aad1dcc9d5e000d2de71c7b2' 2014-08-15 12:45:35 +02:00
libavfilter Merge remote-tracking branch 'cigaes/master' 2014-08-14 19:42:38 +02:00
libavformat vformat/utils: call flush_packet_queue() from avformat_free_context() 2014-08-15 19:48:28 +02:00
libavresample
libavutil Merge commit '7c371754fbc0dcc23bd00278b147f8095ccc5625' 2014-08-15 12:38:36 +02:00
libpostproc
libswresample
libswscale lsws: duplicate ff_log2_tab 2014-08-12 20:52:21 +02:00
presets
tests avfilter/select: larger pixel sad computation 2014-08-14 19:11:13 +02:00
tools
.gitignore
arch.mak
Changelog Merge commit '481a3667495425db9fdffb653292b6460fb68208' 2014-08-14 00:41:21 +02:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c cmdutils: allow matching by metadata in stream specifiers 2014-08-13 17:24:18 +00:00
cmdutils.h
common.mak
configure avutil: turn arm setend into a cpuflag 2014-08-13 14:50:15 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_dxva2.c
ffmpeg_filter.c
ffmpeg_opt.c ffmpeg: remove 32 channel limit from audio_channels_map 2014-08-15 05:38:47 +02:00
ffmpeg_vda.c
ffmpeg_vdpau.c
ffmpeg.c ffmpeg: remove 32 channel limit from audio_channels_map 2014-08-15 05:38:47 +02:00
ffmpeg.h ffmpeg: remove 32 channel limit from audio_channels_map 2014-08-15 05:38:47 +02:00
ffplay.c
ffprobe.c
ffserver.c
INSTALL.md
library.mak
LICENSE.md lavc/flacenc: add sse4 version of the 16-bit lpc encoder 2014-08-13 01:14:47 +02:00
MAINTAINERS
Makefile
README.md
RELEASE
RELEASE_NOTES reset and complete RELEASE_NOTES for the next version 2014-08-13 21:03:55 +02:00
version.sh

FFmpeg README

  1. Documentation

  1. Licensing

  • See the LICENSE file.
  1. Build and Install

  • See the INSTALL file.