RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-03-06 04:28:38 +00:00
Code Issues Projects Releases Wiki Activity
FFmpeg git repo
36,658 Commits 37 Branches 401 Tags 282 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.1%
Other 0.1%
dd3ca3ea15
Go to file
Michael Niedermayer dd3ca3ea15 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  fate: Add tests for more AAC features.
  aacps: Add missing newline in error message.
  fate: Add tests for vc1/wmapro in ism.
  aacdec: Add a fate test for 5.1 channel SBR.
  aacdec: Turn off PS for multichannel files that use PCE based configs.
  cabac: remove put_cabac_u/ueg from cabac-test.
  swscale: RGB4444 and BGR444 input
  FATE: add test for xWMA demuxer.
  FATE: add test for SMJPEG demuxer and associated IMA ADPCM audio decoder.
  mpegaudiodec: optimized iMDCT transform
  mpegaudiodec: change imdct window arrangment for better pointer alignment
  mpegaudiodec: move imdct and windowing function to mpegaudiodsp
  mpegaudiodec: interleave iMDCT buffer to simplify future SIMD implementations
  swscale: convert yuy2/uyvy/nv12/nv21ToY/UV from inline asm to yasm.
  FATE: test to exercise WTV demuxer.
  mjpegdec: K&R formatting cosmetics
  swscale: K&R formatting cosmetics for code examples
  swscale: K&R reformatting cosmetics for header files
  FATE test: cvid-grayscale; ensures that the grayscale Cinepak variant is exercised.

Conflicts:
	libavcodec/cabac.c
	libavcodec/mjpegdec.c
	libavcodec/mpegaudiodec.c
	libavcodec/mpegaudiodsp.c
	libavcodec/mpegaudiodsp.h
	libavcodec/mpegaudiodsp_template.c
	libavcodec/x86/Makefile
	libavcodec/x86/imdct36_sse.asm
	libavcodec/x86/mpegaudiodec_mmx.c
	libswscale/swscale-test.c
	libswscale/swscale.c
	libswscale/swscale_internal.h
	libswscale/x86/swscale_template.c
	tests/fate/demux.mak
	tests/fate/microsoft.mak
	tests/fate/video.mak
	tests/fate/wma.mak
	tests/ref/lavfi/pixfmts_scale

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-10 03:50:41 +01:00
doc lavfi: add audio silencedetect filter. 2012-01-08 17:08:55 +01:00
ffpresets
libavcodec Merge remote-tracking branch 'qatar/master' 2012-01-10 03:50:41 +01:00
libavdevice Merge remote-tracking branch 'qatar/master' 2012-01-08 03:34:22 +01:00
libavfilter lavfi: add audio silencedetect filter. 2012-01-08 17:08:55 +01:00
libavformat rawdec: use av_shrink_packet. 2012-01-09 11:02:21 +01:00
libavutil Merge remote-tracking branch 'qatar/master' 2012-01-10 03:50:41 +01:00
libpostproc Merge remote-tracking branch 'qatar/master' 2012-01-05 02:03:12 +01:00
libswresample libswresample: introduce int swr_set_compensation() instead of void swr_compensate() 2012-01-09 04:16:06 +01:00
libswscale Merge remote-tracking branch 'qatar/master' 2012-01-10 03:50:41 +01:00
mt-work
presets
tests Merge remote-tracking branch 'qatar/master' 2012-01-10 03:50:41 +01:00
tools
.gitignore
avconv.c cmdutils: make show_usage() use av_log() 2012-01-07 11:02:13 +01:00
Changelog lavfi: add audio silencedetect filter. 2012-01-08 17:08:55 +01:00
cmdutils_common_opts.h
cmdutils.c cmdutils: make this_year extern, so it can be referenced from other .o files 2012-01-07 11:02:13 +01:00
cmdutils.h cmdutils: make this_year extern, so it can be referenced from other .o files 2012-01-07 11:02:13 +01:00
common.mak
configure Merge remote-tracking branch 'qatar/master' 2012-01-05 02:03:12 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg.c libswresample: introduce int swr_set_compensation() instead of void swr_compensate() 2012-01-09 04:16:06 +01:00
ffplay.c ffplay: Exit on ctrl-c. 2012-01-09 23:22:56 +01:00
ffprobe.c ffprobe: change formatting logic in the JSON writer 2012-01-09 13:41:35 +01:00
ffserver.c ffserver: check chdir() return 2012-01-08 00:18:36 +01:00
INSTALL
library.mak
LICENSE
MAINTAINERS
Makefile
README
RELEASE
version.sh

README 

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.