wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
No description
30720 commits 40 branches 405 tags 230 MiB
Find a file
Michael Niedermayer 45fb647495 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  bitstream: Properly promote av_reverse values before shifting.
  libavutil/swscale: YUV444P10/YUV444P9 support.
  H.264: Fix high bit depth explicit biweight
  h264: Fix 10-bit H.264 x86 chroma v loopfilter asm.
  Replace DEBUG_SEEK/DEBUG_SI + av_log combinations by av_dlog.
  Update copyright year for ac3enc_opts_template.c.
  adts: Adjust frame size mask to follow the specification.
  movenc: Add RTP muxer/hinter options
  movenc: Pass the RTP AVFormatContext to the SDP generation
  rtspenc: Add RTP muxer options
  rtspenc: Add an AVClass for setting muxer specific options
  rtpenc_chain: Pass the rtpflags options through to the chained muxer
  rtpenc: Declare the rtp flags private AVOptions in rtpenc.h
  sdp: Reindent after the previous commit
  rtpenc: MP4A-LATM payload support
  avoptions: Add an av_opt_flag_is_set function for inspecting flag fields
  sdp: Allow passing an AVFormatContext to the SDP generation
  mov: Fix wrong timestamp generation for fragmented movies that have time offset caused by the first edit list entry.
  mpeg12: more advanced ffmpeg mpeg2 aspect guessing code.
  swscale: split YUYV output out of yuv2packed[12X]_c().

Conflicts:
	doc/APIchanges
	libavcodec/Makefile
	libavcodec/h264dsp_template.c
	libavcodec/mpeg12.c
	libavformat/aacdec.c
	libavformat/avidec.c
	libavformat/internal.h
	libavformat/movenc.c
	libavformat/rtpenc.c
	libavformat/rtpenc_latm.c
	libavformat/sdp.c
	libavformat/version.h
	libavutil/avutil.h
	libavutil/pixfmt.h
	libswscale/swscale.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-11 03:51:36 +02:00
doc Merge remote-tracking branch 'qatar/master' 2011-06-11 03:51:36 +02:00
ffpresets Merge remote-tracking branch 'qatar/master' 2011-05-18 05:42:42 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2011-06-11 03:51:36 +02:00
libavdevice oss,sndio: simplify by using FFMIN. 2011-06-09 22:53:17 +02:00
libavfilter lavfi: avfilter_merge_formats: handle case where inputs are same 2011-06-10 13:04:47 +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 Merge remote-tracking branch 'ffmpeg-mt/master' 2011-05-31 03:10:35 +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.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
cmdutils_common_opts.h cmdutils: remove OPT_FUNC2 2011-05-28 18:23:05 +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 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 Fix -t option for formats which holds dts and no pts 2011-06-11 02:26:26 +02:00
ffplay.c Merge remote-tracking branch 'qatar/master' 2011-06-08 05:25:28 +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 Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
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 Makefile: critical build fix after the merge. make fate passed locally due to ffmpeg/ffmpeg_g being there from before 2011-06-07 04:43:03 +02:00
README Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
subdir.mak Merge remote-tracking branch 'qatar/master' 2011-06-04 06:35:17 +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.