generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
33,592 Commits 24 Branches 241 Tags 173 MiB
C 92.1%
Assembly 6%
Makefile 1.2%
C++ 0.3%
Objective-C 0.2%
Other 0.1%
f884ef00de
Go to file
Michael Niedermayer f884ef00de Merge remote-tracking branch 'qatar/master' 
* qatar/master: (31 commits)
  tiffenc: initialize forgotten avctx.
  avplay: free the active audio packet at exit.
  avplay: free rdft data used for spectrogram analysis.
  log.h: make AVClass a named struct
  fix ac3 encoder documentation
  vc1: more prettyprinting cosmetics
  vc1: prettyprint some tables
  vc1: K&R formatting cosmetics
  AVOptions: bump minor and add APIchanges entry.
  cmdutils/avtools: simplify show_help() by using av_opt_child_class_next()
  AVOptions: rename FF_OPT_TYPE_* => AV_OPT_TYPE_*
  Remove all uses of deprecated AVOptions API.
  AVOptions: add av_opt_next, deprecate av_next_option.
  AVOptions: add functions for evaluating option strings.
  AVOptions: split get_number().
  AVOptions: add av_opt_get*, deprecate av_get*.
  AVOptions: add av_opt_set*().
  AVOptions: add new API for enumerating children.
  rv34: move inverse transform functions to DSP context
  flvenc: Write the right metadata entry count
  ...

Conflicts:
	avconv.c
	cmdutils.c
	doc/APIchanges
	ffplay.c
	ffprobe.c
	libavcodec/ac3dec.c
	libavcodec/h264.c
	libavcodec/libvpxenc.c
	libavcodec/libx264.c
	libavcodec/mpeg12enc.c
	libavcodec/options.c
	libavdevice/libdc1394.c
	libavdevice/v4l2.c
	libavfilter/vf_drawtext.c
	libavformat/flvdec.c
	libavformat/mpegtsenc.c
	libavformat/options.c
	libavutil/avutil.h
	libavutil/opt.c
	libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-13 06:00:03 +02:00
doc Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
ffpresets remove libx264 lossless presets 2011-09-26 22:04:23 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
libavdevice Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
libavfilter Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
libavutil Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
libpostproc postproc: fix compilation failure, now really 2011-09-24 01:51:35 +02:00
libswresample swresample: fix another broken indent chunk. 2011-10-10 15:55:28 +02:00
libswscale Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
mt-work Update todo 2011-06-12 18:01:29 +02:00
tests cdg: set timestamps 2011-10-12 03:47:51 +02:00
tools graph2dot: show timebase information for audio links 2011-09-17 01:36:32 +02:00
.gitignore gitignore: add libswresample* 2011-09-19 17:39:38 +02:00
avconv.c Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
Changelog Merge remote-tracking branch 'qatar/master' 2011-10-11 03:42:43 +02:00
cmdutils_common_opts.h Merge remote-tracking branch 'qatar/master' 2011-10-10 03:50:58 +02:00
cmdutils.c Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
cmdutils.h Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
common.mak Add libswresample. 2011-09-19 07:04:17 +02:00
configure Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
COPYING.GPLv2 Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1. 2009-06-05 09:51:31 +00:00
COPYING.GPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
COPYING.LGPLv2.1 Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1. 2009-06-05 09:51:31 +00:00
COPYING.LGPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
CREDITS Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
Doxyfile doxygen: dont generate docs for avconv.c 2011-09-08 17:56:17 +02:00
ffmpeg.c Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
ffplay.c Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
ffprobe.c Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
LICENSE libaac+ support 2011-09-26 02:28:21 +02:00
MAINTAINERS Add libmodplug support. 2011-10-04 22:36:33 +02:00
Makefile Add libswresample. 2011-09-19 07:04:17 +02:00
README cosmetics: fix dashed line length after 070c5d0 2011-03-28 09:53:40 +02:00
RELEASE RELEASE: 0.8.5 has been released 2011-10-03 23:32:22 +02:00
subdir.mak Merge remote-tracking branch 'qatar/master' 2011-07-31 00:34:47 +02:00
version.sh version.sh: handle shallow clones and snapshots. 2011-07-22 10:43:59 +02:00

README 

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.