xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-12-04 09:44:28 +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!
29,577 Commits 31 Branches 338 Tags 298 MiB
C 91.6%
Assembly 6.5%
Makefile 1.3%
C++ 0.2%
Objective-C 0.1%
2525821f1a
Go to file
Michael Niedermayer 2525821f1a Merge remote branch 'qatar/master' 
* qatar/master:
  vp8: frame-multithreading.
Duplicate  Replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*.
Duplicate  Replace deprecated av_get_pict_type_char() with av_get_picture_type_char().
Bug spoted&removed in last merge:  dpx: Do not use DPX encoder for decoding.

Conflicts:
	ffmpeg.c
	ffplay.c
	libavcodec/h264.c
	libavcodec/mpeg12.c
	libavcodec/mpeg4videodec.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-03 04:08:23 +02:00
doc Merge remote branch 'qatar/master' 2011-05-02 03:45:58 +02:00
ffpresets Remove now useless ffpresets for x264, use -preset 2011-04-16 16:59:39 -07:00
libavcodec Merge remote branch 'qatar/master' 2011-05-03 04:08:23 +02:00
libavdevice Make DV (sub) demuxer set proper pkt->pos values. 2011-05-02 18:38:01 +02:00
libavfilter scale: fix leak occurring when a scale filter is reconfigured 2011-05-02 16:46:24 +02:00
libavformat Add *.j2k extension to JPEG2000 decoder 2011-05-02 18:38:16 +02:00
libavutil AVOptions: av_set_string3() allow NULL strings 2011-05-02 02:58:09 +02:00
libpostproc libpostproc: Remove crufty code disabled by the big bump. 2011-04-20 12:18:47 +02:00
libswscale Merge commit '85770f2a2651497861ed938efcd0df3696ff5e45' 2011-05-01 00:26:05 +02:00
mt-work Merge remote-tracking branch 'ffmpeg-mt/master' 2011-03-30 02:58:38 +02:00
tests Make DV (sub) demuxer set proper pkt->pos values. 2011-05-02 18:38:01 +02:00
tools Merge remote branch 'qatar/master' 2011-04-24 03:41:22 +02:00
.gitignore Remove stray libavcore and _g binary references. 2011-04-23 14:23:20 +02:00
Changelog DPX image encoder 2011-05-01 19:35:55 +02:00
cmdutils_common_opts.h
cmdutils.c lavfi: rename AVFilterBufferRefVideoProps.pixel_aspect to sample_aspect_ratio 2011-05-01 13:10:18 +02:00
cmdutils.h cmdutils: remove list_fmts(), simplify 2011-03-26 14:40:30 +01:00
common.mak Merge remote-tracking branch 'newdev/master' 2011-04-01 02:58:15 +02:00
configure Merge remote branch 'qatar/master' 2011-04-29 04:29:21 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
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 Merge remote branch 'qatar/master' 2011-05-03 04:08:23 +02:00
ffplay.c replace deprecated av_get_pict_type_char() with av_get_picture_type_char() 2011-05-02 16:41:35 +02:00
ffprobe.c Merge remote branch 'qatar/master' 2011-04-24 03:41:22 +02:00
ffserver.c Merge remote branch 'qatar/master' 2011-04-27 03:51:04 +02:00
ffserver.h
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
LICENSE Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
MAINTAINERS add MicroDVD muxer and demuxer 2011-04-04 01:29:40 +02:00
Makefile Merge remote branch 'qatar/master' 2011-04-22 03:54:30 +02:00
README Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01: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.