1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Go to file
Michael Niedermayer 4cd89022e7 Merge commit '2613de88051818abafccb98646394341887acb3a'
We dont use au_read_packet() anymore and block_align is already set.
Thus nothing had to be merged from these.

* commit '2613de88051818abafccb98646394341887acb3a':
  au: do not set pkt->size directly
  au: set block_align and use it in au_read_packet()

Conflicts:
	libavformat/au.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-10 10:56:30 +01:00
compat
doc doc: add noise shaping dithers 2013-01-09 23:28:08 +01:00
libavcodec Fix compilation with --disable-everything. 2013-01-10 10:04:46 +01:00
libavdevice
libavfilter lavfi: fix use-after-free in ff_filter_frame. 2013-01-08 13:31:33 +01:00
libavformat Merge commit '9a7b56883d1333cdfcdf0fa7584a333841b86114' 2013-01-10 10:18:35 +01:00
libavresample Merge remote-tracking branch 'qatar/master' 2013-01-09 12:30:14 +01:00
libavutil Merge commit '5b4dfbffc258f90a7d2540d21209ac23afcf7cd0' 2013-01-07 01:35:18 +01:00
libpostproc
libswresample swr: scale data down in noise shaping to avoid cliping 2013-01-10 01:44:15 +01:00
libswscale
presets
tests fate: upate after 55d32eed8f 2013-01-08 18:47:09 +00:00
tools
.gitignore
arch.mak
Changelog Add forgotten AVC Intra entry to Changelog. 2013-01-08 01:08:36 +01:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure Fix compilation with --disable-everything --enable-decoder=dirac. 2013-01-08 19:59:13 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c ffmpeg: fix dither to 24bit PCM output 2013-01-08 20:28:15 +01:00
ffmpeg.c add note on windows pipe 2013-01-06 17:47:49 +01:00
ffmpeg.h
ffplay.c
ffprobe.c
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS MAINTAINERS: add 1.1, remove 0.10 2013-01-06 21:42:35 +01:00
Makefile
README
RELEASE RELEASE: 1.1.git for master 2013-01-06 21:42:35 +01:00
version.sh

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

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

* Read the documentation in the doc/ directory in git.
  You can also view it online at http://ffmpeg.org/documentation.html

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

* See the LICENSE file.

3) Build and Install
--------------------

* See the INSTALL file.