mirrors/librempeg
1
0
Fork 0
mirror of https://github.com/librempeg/librempeg synced 2024-11-22 09:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
36,933 Commits 35 Branches 387 Tags 187 MiB
C 90.5%
Assembly 7.6%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
c130428ab5
Go to file
Michael Niedermayer c130428ab5 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avprobe, cmdutils: K&R formatting cosmetics
  tests: K&R formatting cosmetics for test programs
  lavf: free packets for muxers implementing interleave_packet().
  lavf: fix and extend av_interleaved_write_frame() doxy.
  mov: Remove dead stores for spherical coordinates for channel position.
  error_resilience: K&R formatting cosmetics
  RELEASE_NOTES: mention hiding private symbols in shared builds.
  RELEASE_NOTES: mention some notable API changes in 0.8

Conflicts:
	cmdutils.h
	doc/RELEASE_NOTES
	ffprobe.c
	libavcodec/error_resilience.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-19 01:19:38 +01:00
doc Merge remote-tracking branch 'qatar/master' 2012-01-19 01:19:38 +01:00
ffpresets
libavcodec Merge remote-tracking branch 'qatar/master' 2012-01-19 01:19:38 +01:00
libavdevice Revert "v4l2: poll the file descriptor" 2012-01-11 14:57:56 +01:00
libavfilter lavfi/testsrc: add "decimals" option to the testsrc filter 2012-01-17 12:03:30 +01:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-01-19 01:19:38 +01:00
libavutil tools: add ffeval tool 2012-01-17 12:10:07 +01:00
libpostproc pp: bump major in git master to match what debian contains. 2012-01-18 21:21:05 +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-15 01:16:54 +01:00
mt-work
presets
tests Merge remote-tracking branch 'qatar/master' 2012-01-19 01:19:38 +01:00
tools tools: add ffeval tool 2012-01-17 12:10:07 +01:00
.gitignore doc: fate: Support building a plain text version 2011-12-20 16:05:01 +01:00
avconv.c Merge remote-tracking branch 'qatar/master' 2012-01-18 02:08:12 +01:00
Changelog Merge remote-tracking branch 'qatar/master' 2012-01-17 02:37:30 +01:00
cmdutils_common_opts.h ff*: add -max_alloc command line option 2011-12-25 18:55:43 +01:00
cmdutils.c Merge remote-tracking branch 'qatar/master' 2012-01-12 01:10:32 +01:00
cmdutils.h Merge remote-tracking branch 'qatar/master' 2012-01-19 01:19:38 +01:00
common.mak
configure configure: provide libavfilter/version.h header to get_version() 2012-01-14 07:44:43 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile Fix a bunch of platform name and other typos. 2012-01-11 13:48:30 +01:00
ffmpeg.c Merge remote-tracking branch 'qatar/master' 2012-01-18 02:08:12 +01:00
ffplay.c ffplay: mark i variable in toggle_full_screen() as unused 2012-01-15 14:51:59 +01:00
ffprobe.c Merge remote-tracking branch 'qatar/master' 2012-01-19 01:19:38 +01:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2012-01-13 01:29:48 +01:00
INSTALL
library.mak Merge remote-tracking branch 'qatar/master' 2011-12-18 03:04:44 +01:00
LICENSE
MAINTAINERS MAINTAINERS: update release maintainers 2012-01-02 16:01:33 +01:00
Makefile Makefile: fix path to ffprobe.xsd 2011-12-27 22:29:40 +01:00
README
RELEASE Merge remote-tracking branch 'qatar/master' 2012-01-12 01:10:32 +01:00
version.sh

README 

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.