1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
Go to file
Michael Niedermayer f8ae3a2108 Merge remote branch 'qatar/master'
12 files changed, 36 insertions(+), 81 deletions(-)
yes thats 36 new lines in 14 commits

* qatar/master:
  ffmpeg: fix -aspect cli option
  Restructure video filter implementation in ffmpeg.c.
  ffplay: remove audio_write_get_buf_size() forward declaration
  lavfi: print key-frame and picture type information in ff_dlog_ref()
  mathops: remove ancient confusing comment
  cws2fws: Improve error message wording.
  tools: Check the return value of write().
  mpegaudio: move OUT_FMT macro to mpegaudiodec.c
  mpegaudio: remove OUT_MIN/MAX macros
  Add missing #includes to mp3_header_(de)compress bsf
  dct: fix indentation
  dct: bypass table allocation for DCT_II of size 32
  h264dsp_mmx: Add #ifdefs around some mmxext functions on x86_64.
  Remove unused header mpegaudio3.h.

Conflicts:
	ffmpeg.c
	libavcodec/mpegaudio.h
	libavcodec/mpegaudio3.h
	libavfilter/avfilter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-17 04:51:33 +02:00
doc showinfo: replace "CRC" by "checksum" 2011-05-15 12:28:53 +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-17 04:51:33 +02:00
libavdevice Merge remote branch 'qatar/master' 2011-05-13 04:40:40 +02:00
libavfilter Add some forgotten const to function arguments in libavfilter & libavformat. 2011-05-17 03:05:36 +02:00
libavformat Add some forgotten const to function arguments in libavfilter & libavformat. 2011-05-17 03:05:36 +02:00
libavutil imgutils: introduce internal image_get_linesize() and use it 2011-05-16 23:55:54 +02:00
libpostproc Merge remote branch 'qatar/master' 2011-05-09 04:50:56 +02:00
libswscale swscale: fix compile on mingw32 2011-05-14 13:22:46 +02:00
mt-work
tests iff/8svx: redesign 8SVX demuxing and decoding for handling stereo samples correctly 2011-05-17 00:58:33 +02:00
tools Merge remote branch 'qatar/master' 2011-05-17 04:51:33 +02:00
.gitignore
Changelog Initial caf muxer. 2011-05-15 03:25:57 +02:00
cmdutils_common_opts.h
cmdutils.c cmdutils: Allocate private decoder context if its not allocated yet. 2011-05-16 21:26:18 +02:00
cmdutils.h cmdutils: remove list_fmts(), simplify 2011-05-10 07:14:13 +02:00
common.mak
configure Merge remote branch 'qatar/master' 2011-05-16 05:01:40 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg.c Merge remote branch 'qatar/master' 2011-05-17 04:51:33 +02:00
ffplay.c ffplay: remove audio_write_get_buf_size() forward declaration 2011-05-16 14:13:03 -07:00
ffprobe.c ffprobe: tweak error message in open_input_file() 2011-05-12 13:03:10 +02:00
ffserver.c Merge remote branch 'qatar/master' 2011-05-13 04:40:40 +02:00
ffserver.h
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 Makefile:Put lost tab back. 2011-05-06 02:21:52 +02:00
README
subdir.mak
version.sh

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.