RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-19 22:10:34 +00:00
Code Issues Projects Releases Wiki Activity
FFmpeg git repo
30,736 Commits 37 Branches 400 Tags 241 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
f0e9ee8d94
Go to file
Michael Niedermayer f0e9ee8d94 Revert "H264: Split out hl_motion and template it, this seems a bit faster" 
This reverts commit a50f0bea25.

This has been implemented differently in qatar and its better they
maintain it for me instead of me having to spend an average 5sec more
per merge

Conflicts:

	libavcodec/h264.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-13 03:49:36 +02:00
doc libavfilter: implement avfilter_fill_frame_from_video_buffer_ref() 2011-06-12 22:46:02 +02:00
ffpresets Merge remote-tracking branch 'qatar/master' 2011-05-18 05:42:42 +02:00
libavcodec Revert "H264: Split out hl_motion and template it, this seems a bit faster" 2011-06-13 03:49:36 +02:00
libavdevice v4l2: set default standard to NULL 2011-06-07 13:37:55 +02:00
libavfilter libavfilter: implement avfilter_fill_frame_from_video_buffer_ref() 2011-06-12 22:46:02 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2011-06-11 03:51:36 +02:00
libavutil Merge remote-tracking branch 'qatar/master' 2011-06-11 03:51:36 +02:00
libpostproc postprocess: Remove test for impossible condition (was: Re: postprocess.c: replace check for p==NULL with *p==0) 2011-06-02 14:43:14 +02:00
libswscale Merge remote-tracking branch 'qatar/master' 2011-06-11 03:51:36 +02:00
mt-work Update todo 2011-06-12 18:01:29 +02:00
tests Fix -t option for formats which holds dts and no pts 2011-06-11 02:26:26 +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 Merge remote-tracking branch 'qatar/master' into master 2011-05-29 03:34:35 +02:00
cmdutils_common_opts.h cmdutils: remove OPT_FUNC2 2011-05-28 18:23:05 +02:00
cmdutils.c cmdutils: remove unnecessary OPT_DUMMY implementation 2011-06-05 13:21:06 +02:00
cmdutils.h cmdutils: remove unnecessary OPT_DUMMY implementation 2011-06-05 13:21:06 +02:00
common.mak Revert "build: remove empty $(OBJS) target" 2011-06-08 23:44:18 +02:00
configure Merge remote-tracking branch 'qatar/master' 2011-06-08 05:25:28 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg.c avfiltergraph: make the AVFilterInOut alloc/free API public 2011-06-12 22:46:02 +02:00
ffplay.c avfiltergraph: make the AVFilterInOut alloc/free API public 2011-06-12 22:46:02 +02:00
ffprobe.c Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +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
MAINTAINERS add MicroDVD muxer and demuxer 2011-04-04 01:29:40 +02:00
Makefile Merge remote-tracking branch 'qatar/master' 2011-06-12 04:30:19 +02:00
README
subdir.mak Merge remote-tracking branch 'qatar/master' 2011-06-04 06:35:17 +02:00
version.sh

README 

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.