RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
FFmpeg git repo
28,872 Commits 37 Branches 400 Tags 278 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
Go to file
Michael Niedermayer 434f248723 Merge remote branch 'qatar/master' 
* qatar/master: (22 commits)
  ac3enc: move extract_exponents inner loop to ac3dsp
  avio: deprecate url_get_filename().
  avio: deprecate url_max_packet_size().
  avio: make url_get_file_handle() internal.
  avio: make url_filesize() internal.
  avio: make url_close() internal.
  avio: make url_seek() internal.
  avio: cosmetics, move AVSEEK_SIZE/FORCE declarations together
  avio: make url_write() internal.
  avio: make url_read_complete() internal.
  avio: make url_read() internal.
  avio: make url_open() internal.
  avio: make url_connect internal.
  avio: make url_alloc internal.
  applehttp: Merge two for loops
  applehttp: Restructure the demuxer to use a custom AVIOContext
  applehttp: Move finished and target_duration to the variant struct
  aacenc: reduce the number of loop index variables
  avio: deprecate url_open_protocol
  avio: deprecate url_poll and URLPollEntry
  ...

Conflicts:
	libavformat/applehttp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 		2011-04-05 02:31:56 +02:00
doc Merge remote branch 'qatar/master' 2011-04-04 02:15:12 +02:00
ffpresets
…
libavcodec Merge remote branch 'qatar/master' 2011-04-05 02:31:56 +02:00
libavdevice ALSA: fix a stupid bad use of av_freep. 2011-03-31 18:49:07 +02:00
libavfilter Merge remote branch 'qatar/master' 2011-04-04 02:15:12 +02:00
libavformat Merge remote branch 'qatar/master' 2011-04-05 02:31:56 +02:00
libavutil Fix apparently exploitable race condition. 2011-03-25 02:24:32 +01:00
libpostproc Merge remote-tracking branch 'newdev/master' 2011-03-19 20:05:11 +01:00
libswscale Fix yuvj420p scaling artefact, issue1108. 2011-04-03 16:40:11 +02:00
mt-work Merge remote-tracking branch 'ffmpeg-mt/master' 2011-03-30 02:58:38 +02:00
tests Merge remote branch 'qatar/master' 2011-04-05 02:31:56 +02:00
tools Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
.gitignore
…
COPYING.GPLv2
…
COPYING.GPLv3
…
COPYING.LGPLv2.1
…
COPYING.LGPLv3
…
CREDITS
…
Changelog add MicroDVD muxer and demuxer 2011-04-04 01:29:40 +02:00
Doxyfile Merge remote-tracking branch 'newdev/master' 2011-03-19 20:05:11 +01:00
INSTALL
…
LICENSE cosmetics: fix dashed line length after 070c5d0 2011-03-28 09:53:40 +02:00
MAINTAINERS add MicroDVD muxer and demuxer 2011-04-04 01:29:40 +02:00
Makefile Revert "Remove support for stripping executables" 2011-04-01 00:24:12 +02:00
README cosmetics: fix dashed line length after 070c5d0 2011-03-28 09:53:40 +02:00
cmdutils.c cmdutils: remove list_fmts(), simplify 2011-03-26 14:40:30 +01:00
cmdutils.h cmdutils: remove list_fmts(), simplify 2011-03-26 14:40:30 +01:00
cmdutils_common_opts.h
…
common.mak Merge remote-tracking branch 'newdev/master' 2011-04-01 02:58:15 +02:00
configure Merge remote branch 'qatar/master' 2011-04-04 02:15:12 +02:00
ffmpeg.c ffmpeg: make 'bits_per_raw_sample' option more useful 2011-04-04 00:35:58 +02:00
ffplay.c ffplay: Don't assume ic->pb is non-null 2011-03-21 15:08:09 -04:00
ffprobe.c ffprobe: provide format parameters to av_open_input_file() 2011-03-26 14:41:51 +01:00
ffserver.c Merge remote branch 'qatar/master' 2011-04-04 02:15:12 +02:00
ffserver.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
subdir.mak Revert "Remove support for stripping executables" 2011-04-01 00:24:12 +02:00
version.sh Merge remote-tracking branch 'newdev/master' 2011-03-19 20:05:11 +01:00

README 

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.