RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-19 05:55:07 +00:00
Code Issues Projects Releases Wiki Activity
FFmpeg git repo
38,810 Commits 37 Branches 400 Tags 241 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
67235dfa1d
Go to file
Michael Niedermayer 67235dfa1d Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  h264: stricter reference limit enforcement.
  h264: increase reference poc list from 16 to 32.
  xa_adpcm: limit filter to prevent xa_adpcm_table[] array bounds overruns.
  snow: check reference frame indices.
  snow: reject unsupported chroma shifts.
  Add ffvhuff encoding and decoding regression test
  anm: convert to bytestream2 API
  bytestream: add more unchecked variants for bytestream2 API
  jvdec: unbreak video decoding
  jv demux: set video stream duration
  fate: add pam image regression test

Conflicts:
	libavcodec/adpcm.c
	libavcodec/anm.c
	libavcodec/h264.c
	libavcodec/mpegvideo.h
	libavcodec/snowdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-15 01:27:10 +01:00
doc docs: Add examples for -cpuflags 2012-03-14 23:06:00 +01:00
ffpresets
libavcodec Merge remote-tracking branch 'qatar/master' 2012-03-15 01:27:10 +01:00
libavdevice
libavfilter vf_fspp: add ff_ prefix to non static variables. 2012-03-14 23:06:00 +01:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-03-15 01:27:10 +01:00
libavutil Merge remote-tracking branch 'qatar/master' 2012-03-13 01:56:33 +01:00
libpostproc
libswresample cosmetics: fix some typos 2012-03-13 01:14:04 +01:00
libswscale Merge remote-tracking branch 'qatar/master' 2012-03-08 02:51:45 +01:00
mt-work
presets
tests Merge remote-tracking branch 'qatar/master' 2012-03-15 01:27:10 +01:00
tools Merge remote-tracking branch 'qatar/master' 2012-03-10 01:12:08 +01:00
.gitignore
Changelog lavfi: port MP swapuv filter 2012-03-10 00:10:37 +01:00
cmdutils_common_opts.h
cmdutils.c cmdutils: Fix cpuflags so the flags dont pull in and out other flags. 2012-03-14 23:05:38 +01:00
cmdutils.h
common.mak
configure Merge remote-tracking branch 'qatar/master' 2012-03-13 01:56:33 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg.c ffmpeg: Fix planar audio input. 2012-03-14 08:03:29 +01:00
ffplay.c ffplay: fix two const warnings. 2012-03-08 17:13:58 +01:00
ffprobe.c
ffserver.c ffserver: add missing buffer set after rewrite av_open_input_file to avformat_open_input. 2012-03-12 03:31:59 +01:00
INSTALL
library.mak
LICENSE
MAINTAINERS cosmetics: fix some typos 2012-03-13 01:14:04 +01:00
Makefile
README
RELEASE
version.sh

README 

FFmpeg README
-------------

1) Documentation
----------------

* Read the documentation in the doc/ directory.

2) Licensing
------------

* See the LICENSE file.