1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Go to file
Michael Niedermayer 7b453d1c60 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  westwood_vqa: fix SND0 chunk handling
  westwood_vqa: set video stream duration
  raw: forward avpicture_fill() error code in raw_decode().
  build: Do not explicitly add the doc directory to the OBJDIRS list.
  dv: Split off DV video decoder into its own file.
  build: fix RALF decoder standalone compilation, which depends on Golomb code
  configure: Drop stray duplicate entry for --disable-fft from help output.

Conflicts:
	libavcodec/dv.c
	libavcodec/rawdec.c
	libavformat/westwood_vqa.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-28 04:12:24 +02:00
doc Merge remote-tracking branch 'qatar/master' 2012-03-28 04:12:24 +02:00
ffpresets
libavcodec Merge remote-tracking branch 'qatar/master' 2012-03-28 04:12:24 +02:00
libavdevice
libavfilter lavfi: add avfilter_fill_frame_from_{audio_,}buffer_ref(). 2012-03-26 22:46:40 +02:00
libavformat id3v2: support JPEG APIC with incorrect (image/jpg) MIME type 2012-03-28 02:37:18 +02:00
libavutil Merge remote-tracking branch 'qatar/master' 2012-03-26 20:52:52 +02:00
libpostproc
libswresample swr-test: test the new flexible buffering 2012-03-25 21:50:49 +02:00
libswscale Merge remote-tracking branch 'qatar/master' 2012-03-26 20:52:52 +02:00
mt-work
presets
tests vf_hflip: accept PIX_FMT_RGB444 and PIX_FMT_BGR444 pixel formats 2012-03-26 01:02:18 +02:00
tools
.gitignore Merge remote-tracking branch 'qatar/master' 2012-03-25 23:10:30 +02:00
Changelog XBM decoder 2012-03-27 20:08:41 +02:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure Merge remote-tracking branch 'qatar/master' 2012-03-28 04:12:24 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg.c ffmpeg: fix handling or empty audio packets 2012-03-27 02:43:40 +02:00
ffplay.c ffplay: pause rdft column when ffplay is paused 2012-03-27 21:35:56 +02:00
ffprobe.c
ffserver.c
INSTALL
library.mak Merge remote-tracking branch 'qatar/master' 2012-03-26 20:52:52 +02:00
LICENSE
MAINTAINERS
Makefile Merge remote-tracking branch 'qatar/master' 2012-03-26 20:52:52 +02:00
README
RELEASE RELEASE: bump to current version (0.10.2). 2012-03-26 22:47:28 +02:00
version.sh

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.