1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Go to file
Michael Niedermayer 57fa2fc69f Merge remote-tracking branch 'cus/stable'
* cus/stable:
  ffplay: use libswresample instead of av_audio_convert
  audioconvert: add av_get_default_channel_layout public function
  ffplay: use avctx->channels and avctx->freq before avcodec_open2 consistently
  ffplay: remove now unnecessary request_channels, we set it now with options
  ffplay: set request_channels to 2

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-02 23:53:33 +02:00
doc vf_lut.c: fix wrong syntax in example 2011-10-02 15:21:12 +02:00
ffpresets remove libx264 lossless presets 2011-09-26 22:04:23 +02:00
libavcodec h264: fix intra 16x16 mode check when using mbaff and constrained_intra_pred. 2011-10-02 21:20:57 +02:00
libavdevice Merge remote-tracking branch 'qatar/master' 2011-09-24 22:39:52 +02:00
libavfilter lavfi: remove usage of deprecated av_opt_set_defaults2() function 2011-10-02 15:16:36 +02:00
libavformat riff: map 0x0038 to amrnb, works on http://video.mopoto.com/4/40/407/40709.avi 2011-10-02 17:41:16 -04:00
libavutil audioconvert: add av_get_default_channel_layout public function 2011-10-02 21:21:46 +02:00
libpostproc postproc: fix compilation failure, now really 2011-09-24 01:51:35 +02:00
libswresample swresample: check for invalid sample formats. 2011-10-01 01:39:17 +02:00
libswscale Merge remote-tracking branch 'qatar/master' 2011-09-25 23:30:25 +02:00
mt-work Update todo 2011-06-12 18:01:29 +02:00
tests Clear FF_INPUT_BUFFER_PADDING_SIZE bytes at the end of the temporary buffer used in motion pixels decoder. 2011-09-30 02:09:59 +02:00
tools graph2dot: show timebase information for audio links 2011-09-17 01:36:32 +02:00
.gitignore gitignore: add libswresample* 2011-09-19 17:39:38 +02:00
avconv.c Merge remote-tracking branch 'qatar/master' 2011-09-29 01:11:01 +02:00
Changelog G.723.1 doc and change log entry 2011-09-29 21:44:03 +02:00
cmdutils_common_opts.h Merge remote-tracking branch 'qatar/master' 2011-09-12 00:32:54 +02:00
cmdutils.c Show configuration and library version with AV_LOG_INFO. 2011-09-29 12:59:05 +02:00
cmdutils.h Merge remote-tracking branch 'qatar/master' 2011-09-27 02:14:37 +02:00
common.mak Add libswresample. 2011-09-19 07:04:17 +02:00
configure Merge remote-tracking branch 'qatar/master' 2011-09-27 02:14:37 +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 doxygen: dont generate docs for avconv.c 2011-09-08 17:56:17 +02:00
ffmpeg.c Merge remote-tracking branch 'qatar/master' 2011-09-29 01:11:01 +02:00
ffplay.c ffplay: use libswresample instead of av_audio_convert 2011-10-02 22:23:11 +02:00
ffprobe.c ffprobe: fix trailing '=' in stream id. 2011-09-28 17:57:22 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2011-10-01 02:54:46 +02: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: loose svn reference 2011-09-23 19:18:58 +02:00
Makefile Add libswresample. 2011-09-19 07:04:17 +02:00
README Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
RELEASE RELEASE: set to 0.8.4.git after the release from 2011-09-22 2011-09-27 21:32:17 +02:00
subdir.mak Merge remote-tracking branch 'qatar/master' 2011-07-31 00:34:47 +02:00
version.sh version.sh: handle shallow clones and snapshots. 2011-07-22 10:43:59 +02:00

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.