generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
35,366 Commits 24 Branches 241 Tags 173 MiB
C 92.1%
Assembly 6%
Makefile 1.2%
C++ 0.3%
Objective-C 0.2%
Other 0.1%
7b0b10ce41
Go to file
Michael Niedermayer 7b0b10ce41 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (25 commits)
  rtpenc: Add support for G726 audio
  rtpdec: Interpret the different G726 names as bits_per_coded_sample
  rtpenc: Change rtp_send_samples to handle sample sizes other than even bytes
  rtpenc: Cast a rescaling parameter to int64_t
  h264: cap max has_b_frames at MAX_DELAYED_PIC_COUNT - 1.
  ARM: fix indentation in ff_dsputil_init_neon()
  ARM: NEON put/avg_pixels8/16 cosmetics
  ARM: add remaining NEON avg_pixels8/16 functions
  ARM: clean up NEON put/avg_pixels macros
  fate: split acodec-pcm into individual tests
  swscale: #include "libavutil/mathematics.h"
  pmpdec: don't use deprecated av_set_pts_info.
  rv34: align temporary block of "dct" coefs
  Add PlayStation Portable PMP format demuxer
  proto: Realign struct initializers
  proto: Use .priv_data_size to allocate the private context
  mmsh: Properly clean up if the second ffurl_alloc failed
  rtmp: Clean up properly if the handshake failed
  md5proto: Remove the get_file_handle function
  applehttpproto: Use the close function if the open function fails
  ...

Conflicts:
	libavcodec/vble.c
	libavformat/mmsh.c
	libavformat/pmpdec.c
	libavformat/udp.c
	tests/ref/acodec/pcm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-02 00:51:11 +01:00
doc Add PlayStation Portable PMP format demuxer 2011-12-01 13:54:43 +01:00
ffpresets Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2011-12-02 00:51:11 +01:00
libavdevice Merge remote-tracking branch 'qatar/master' 2011-12-01 02:54:24 +01:00
libavfilter avfilter: align allocated images to 32 for AVX and IFF 2011-11-30 18:53:47 +01:00
libavformat Merge remote-tracking branch 'qatar/master' 2011-12-02 00:51:11 +01:00
libavutil avutil: revert project name messing 2011-11-29 16:09:56 +01:00
libpostproc postproc: remove stray + 2011-10-30 18:11:09 +01:00
libswresample swr: handle correctly muted channel with u8 sample fmt. 2011-11-29 17:14:25 +01:00
libswscale Merge remote-tracking branch 'qatar/master' 2011-12-02 00:51:11 +01:00
mt-work Update todo 2011-06-12 18:01:29 +02:00
presets Remove redundant libx264 preset files 2011-10-22 01:32:10 +02:00
tests Merge remote-tracking branch 'qatar/master' 2011-12-02 00:51:11 +01:00
tools lavfi-showfiltfmts.c: fix handling of null names 2011-11-26 18:12:25 +01:00
.gitignore gitignore: add libswresample* 2011-09-19 17:39:38 +02:00
avconv.c Merge remote-tracking branch 'qatar/master' 2011-12-01 02:54:24 +01:00
Changelog Merge remote-tracking branch 'qatar/master' 2011-12-02 00:51:11 +01:00
cmdutils_common_opts.h cmdutils: Fix loglevel for -debug 2011-10-14 02:18:55 +02:00
cmdutils.c cmdutils: pass AVCodec to filter_codec_opts() 2011-11-27 21:17:56 +01:00
cmdutils.h cmdutils: pass AVCodec to filter_codec_opts() 2011-11-27 21:17:56 +01:00
common.mak Add rule for compiling to asm 2011-10-22 20:49:24 +02:00
configure configure: add forgotten libx264rgb_encoder_deps 2011-12-01 22:29:58 +01: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 doxygen: dont generate docs for avconv.c 2011-09-08 17:56:17 +02:00
ffmpeg.c Support ffmpeg -dn to disable copying data streams. 2011-12-01 18:02:04 +01:00
ffplay.c ffplay: Copy audio side data too. This fixes handling of some rare nellymoser files that change the sample rate mid stream (sample file at: http://trac.videolan.org/vlc/ticket/5586) 2011-12-01 20:55:01 +01:00
ffprobe.c ffprobe: print codec timecode if available. 2011-11-28 14:06:02 +01:00
ffserver.c ffserver: use av_noreturn 2011-11-11 04:25:53 +01:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
LICENSE libaac+ support 2011-09-26 02:28:21 +02:00
MAINTAINERS MAINTAINERS: add myself as a web site maintainer 2011-11-21 00:07:52 +01:00
Makefile Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
README Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
RELEASE RELEASE: We're now at 0.8.7.git 2011-11-25 14:37:35 +01:00
subdir.mak Add rule for compiling to asm 2011-10-22 20:49:24 +02:00
version.sh version.sh: handle shallow clones and snapshots. 2011-07-22 10:43:59 +02:00

README 

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.