xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-27 21:40:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
Fork of FFmpeg for xenia's usage. Branched from latest release. On changes use a git rebase strategy when applicable!
31,095 Commits 31 Branches 338 Tags 298 MiB
C 91.6%
Assembly 6.5%
Makefile 1.3%
C++ 0.2%
Objective-C 0.1%
8c0cbb0848
Go to file
Michael Niedermayer 8c0cbb0848 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  rational-test: Add proper main() declaration to fix gcc warnings.
  configure: Add vdpau and dxva2 to configure results output.
  Remove unused, never built libavutil/pca.[ch]
  matroskadec: forward parsing errors to caller.
  av_find_stream_info: simplify EAGAIN handling.
  aacenc: Fix determination of Mid/Side Mode.
  psymodel: Remove the single channel analysis function
  aacenc: Implement dummy channel group analysis that just calls the single channel analysis for each channel.
  psymodel: Add channels and channel groups to the psymodel.
  ARM: remove check for PLD instruction
  fate: move amr[nw]b test rules into separate files
  ogg: fix double free when finding length of small chained oggs.
  swscale: implement >8bit scaling support.
  build: fix creation of tools dir with make 3.81
  build: Mark all-yes Makefile target as phony.
  pixfmt: fix YUV422/444 wrong endian comment
  build: create output directories as needed
  Add new yuv444 pixfmts to avcodec_align_dimensions2

Conflicts:
	Makefile
	configure
	libavutil/pca.c
	libavutil/pca.h
	libavutil/pixfmt.h
	libswscale/swscale.c
	libswscale/utils.c
	libswscale/x86/swscale_template.c
	tests/ref/lavfi/pixdesc
	tests/ref/lavfi/pixfmts_copy
	tests/ref/lavfi/pixfmts_null
	tests/ref/lavfi/pixfmts_scale
	tests/ref/lavfi/pixfmts_vflip

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-30 04:32:24 +02:00
doc Merge remote-tracking branch 'qatar/master' 2011-06-30 04:32:24 +02:00
ffpresets presets: forgotten libvpx presets 2011-06-21 17:52:16 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2011-06-30 04:32:24 +02:00
libavdevice Merge remote-tracking branch 'qatar/master' 2011-06-29 05:23:12 +02:00
libavfilter Merge remote-tracking branch 'qatar/master' 2011-06-29 05:23:12 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2011-06-30 04:32:24 +02:00
libavutil Merge remote-tracking branch 'qatar/master' 2011-06-30 04:32:24 +02:00
libpostproc Merge remote-tracking branch 'qatar/master' 2011-06-29 05:23:12 +02:00
libswscale swscale: implement >8bit scaling support. 2011-06-29 09:45:52 -07:00
mt-work Update todo 2011-06-12 18:01:29 +02:00
tests Merge remote-tracking branch 'qatar/master' 2011-06-30 04:32:24 +02:00
tools showfiltfmts: use av_get_pix_fmt_name() 2011-06-07 12:44:51 +02:00
.gitignore Merge remote-tracking branch 'qatar/master' 2011-05-20 05:48:22 +02:00
Changelog lavdev: add openal input device 2011-06-27 15:26:14 +02:00
cmdutils_common_opts.h cmdutils: remove OPT_FUNC2 2011-05-28 18:23:05 +02:00
cmdutils.c parse_options(): Avoid passing NULL as a string arg to fprintf 2011-06-24 13:04:51 -04:00
cmdutils.h lavfi: add vsink_buffer, and use it in ff* tools 2011-06-19 19:18:33 +02:00
common.mak Merge remote-tracking branch 'qatar/master' 2011-06-30 04:32:24 +02:00
configure Merge remote-tracking branch 'qatar/master' 2011-06-30 04:32:24 +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 Merge remote-tracking branch 'newdev/master' 2011-03-19 20:05:11 +01:00
ffmpeg.c Set channel_layout if channels is set when transcoding. 2011-06-29 23:49:44 +02:00
ffplay.c ffplay: use new avformat_open_* API. 2011-06-22 20:08:45 +02:00
ffprobe.c ffprobe: remove duplicate avformat_alloc_context() 2011-06-21 14:38:58 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2011-06-18 05:10:38 +02:00
ffserver.h multiple inclusion guard cleanup 2011-05-21 13:48:10 +02:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
LICENSE cosmetics: fix dashed line length after 070c5d0 2011-03-28 09:53:40 +02:00
MAINTAINERS MAINTAINERS: add a "Releases" section 2011-06-24 11:15:26 +02:00
Makefile Merge remote-tracking branch 'qatar/master' 2011-06-30 04:32:24 +02:00
README cosmetics: fix dashed line length after 070c5d0 2011-03-28 09:53:40 +02:00
RELEASE Use the contents of RELEASE as version fallback instead of 'UNKNOWN' 2011-06-19 19:54:07 +02:00
subdir.mak Merge remote-tracking branch 'qatar/master' 2011-06-29 05:23:12 +02:00
version.sh Merge remote-tracking branch 'qatar/master' 2011-06-20 04:07:34 +02:00

README 

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.