RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-14 18:47:47 +00:00
Code Issues Projects Releases Wiki Activity
FFmpeg git repo
37,608 Commits 37 Branches 400 Tags 269 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
b479e01612
Go to file
Michael Niedermayer b479e01612 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Revert "v210enc: use FFALIGN()"
  doxygen: Do not include license boilerplates in Doxygen comment blocks.
  avplay: reset decoder flush state when seeking
  ape: skip packets with invalid size
  ape: calculate final packet size instead of guessing
  ape: stop reading after the last frame has been read
  ape: return AVERROR_EOF instead of AVERROR(EIO) when demuxing is finished
  ape: return error if seeking to the current packet fails in ape_read_packet()
  avcodec: Clarify AVFrame member documentation.
  v210dec: check for coded_frame allocation failure
  v210enc: use stride as it is already calculated
  v210enc: use FFALIGN()
  v210enc: return proper AVERROR codes instead of -1
  v210enc: do not set coded_frame->key_frame
  v210enc: check for coded_frame allocation failure
  drawtext: add 'fix_bounds' option on coords fixing
  drawtext: fix text_{w, h} expression vars
  drawtext: add missing braces around an if() block.

Conflicts:
	libavcodec/arm/vp8.h
	libavcodec/arm/vp8dsp_init_arm.c
	libavcodec/v210dec.c
	libavfilter/vf_drawtext.c
	libavformat/ape.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-07 01:40:29 +01:00
doc Merge remote-tracking branch 'qatar/master' 2012-02-07 01:40:29 +01:00
ffpresets
libavcodec Merge remote-tracking branch 'qatar/master' 2012-02-07 01:40:29 +01:00
libavdevice Support YV12 from video4linux2 devices. 2012-02-05 20:06:12 +01:00
libavfilter Merge remote-tracking branch 'qatar/master' 2012-02-07 01:40:29 +01:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-02-07 01:40:29 +01:00
libavutil lavu: introduce av_parse_ratio() and use it in ffmpeg and lavfi/aspect 2012-02-06 11:30:54 +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 Merge remote-tracking branch 'qatar/master' 2012-02-03 03:51:32 +01:00
mt-work
presets
tests fate: use compression level 0 for flashsv2 tests. 2012-02-04 19:59:40 +01:00
tools Fix "ouput" typo and add a check. 2012-01-28 11:04:19 +01:00
.gitignore Merge remote-tracking branch 'qatar/master' 2012-01-26 02:23:56 +01:00
Changelog lavfi: add setfield filter 2012-02-06 20:46:58 +01:00
cmdutils_common_opts.h ff*: add -max_alloc command line option 2011-12-25 18:55:43 +01:00
cmdutils.c cmdutils: re-add return 0 accidentally remove from opt_protocols(). 2012-01-28 12:39:57 +01:00
cmdutils.h Drop unnecessary prefix from *sink* variable and struct names. 2012-01-25 12:28:36 +01:00
common.mak
configure Merge remote-tracking branch 'qatar/master' 2012-02-03 03:51:32 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile remove avconv from Doxyfile 2012-01-25 22:47:45 +01:00
ffmpeg.c ffmpeg: document the unit for the -fs option parameter 2012-02-06 20:47:09 +01:00
ffplay.c Merge remote-tracking branch 'qatar/master' 2012-02-07 01:40:29 +01:00
ffprobe.c ffprobe: fix typo in ESCAPE_CHECK_SIZE 2012-02-06 11:30:45 +01:00
ffserver.c ffserver: fix program reference 2012-02-01 19:33:51 +01:00
INSTALL
library.mak Merge remote-tracking branch 'qatar/master' 2011-12-18 03:04:44 +01:00
LICENSE
MAINTAINERS maintainers: add myself for recent works. 2012-01-24 16:07:53 +01:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-02-04 02:34:14 +01:00
README
RELEASE Merge remote-tracking branch 'qatar/master' 2012-01-21 23:11:27 +01:00
version.sh

README 

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.