videolan/ffmpeg
1
Fork 0
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-09-12 10:25:32 +02:00
Code Releases Activity
37,136 Commits 36 Branches 398 Tags 244 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
1d9569f9e8
Go to file
Michael Niedermayer 1d9569f9e8 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (23 commits)
  aacenc: Fix identification padding when the bitstream is already aligned.
  aacenc: Write correct length for long identification strings.
  aud: remove unneeded field, audio_stream_index from context
  aud: fix time stamp calculation for ADPCM IMA WS
  aud: simplify header parsing
  aud: set pts_wrap_bits to 64.
  cosmetics: indentation
  aud: support Westwood SND1 audio in AUD files.
  adpcm_ima_ws: fix stereo decoding
  avcodec: add a new codec_id for CRYO APC IMA ADPCM.
  vqa: remove unused context fields, audio_samplerate and audio_bits
  vqa: clean up audio header parsing
  vqa: set time base to frame rate as coded in the header.
  vqa: set packet duration.
  vqa: use 1/sample_rate as the audio stream time base
  vqa: set stream start_time to 0.
  lavc: postpone the removal of AVCodecContext.request_channels.
  lavf: postpone removing av_close_input_file().
  lavc: postpone removing old audio encoding and decoding API
  avplay: remove the -er option.
  ...

Conflicts:
	Changelog
	libavcodec/version.h
	libavdevice/v4l.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-24 22:53:59 +01:00
doc doc: add Timecode documentation. 2012-01-24 16:20:21 +01:00
ffpresets Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2012-01-24 22:53:59 +01:00
libavdevice Merge remote-tracking branch 'qatar/master' 2012-01-24 22:53:59 +01:00
libavfilter lavfi: require libswr for af_pan. 2012-01-24 12:11:04 +01:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-01-24 22:53:59 +01:00
libavutil base64: 10l endian fix. 2012-01-22 23:06:04 +01:00
libpostproc build: Allow building old API/ABI libpostproc version 2012-01-24 17:01:10 +01:00
libswresample libswresample: introduce int swr_set_compensation() instead of void swr_compensate() 2012-01-09 04:16:06 +01:00
libswscale sws: Fix RGB0->alpha containing formats. 2012-01-24 17:01:10 +01:00
mt-work Update todo 2011-06-12 18:01:29 +02:00
presets Remove redundant libx264 preset files 2011-10-22 01:32:10 +02:00
tests movenc: Decrease default chunk merge limit to 1mb. 2012-01-23 23:41:32 +01:00
tools Merge remote-tracking branch 'qatar/master' 2012-01-21 23:11:27 +01:00
.gitignore Remove ffmpeg. 2012-01-23 21:04:29 +01:00
avconv.c Merge remote-tracking branch 'qatar/master' 2012-01-21 23:11:27 +01:00
Changelog Merge remote-tracking branch 'qatar/master' 2012-01-24 22:53:59 +01:00
cmdutils_common_opts.h ff*: add -max_alloc command line option 2011-12-25 18:55:43 +01:00
cmdutils.c cmdutils: include type in filter list. 2012-01-19 23:33:17 +01:00
cmdutils.h Merge remote-tracking branch 'qatar/master' 2012-01-19 01:19:38 +01:00
common.mak Add coverage support. 2011-12-05 20:04:48 +01:00
configure lavd: remove deprecated v4l grab device. 2012-01-24 18:04:19 +01: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 Merge remote-tracking branch 'qatar/master' 2011-12-26 04:10:47 +01:00
ffmpeg.c ffmpeg: Allocate buffers of the size needed by the decoder. 2012-01-24 15:36:38 +01:00
ffplay.c Merge remote-tracking branch 'qatar/master' 2012-01-24 22:53:59 +01:00
ffprobe.c ffprobe: increase precision for the shown float values 2012-01-20 13:27:57 +01:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2012-01-23 01:05:20 +01:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
library.mak Merge remote-tracking branch 'qatar/master' 2011-12-18 03:04:44 +01:00
LICENSE libaac+ support 2011-09-26 02:28:21 +02:00
MAINTAINERS maintainers: add myself for recent works. 2012-01-24 16:07:53 +01:00
Makefile Remove ffmpeg. 2012-01-23 21:04:29 +01:00
README Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
RELEASE Merge remote-tracking branch 'qatar/master' 2012-01-21 23:11:27 +01: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.