1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Go to file
Michael Niedermayer 4fa0e24736 Merge remote-tracking branch 'newdev/master'
* newdev/master: (33 commits)
  Fix an infinite loop when RoQ encoded generated a frame with a size greater than the maximum valid size.
  Add kbdwin.o to AC3 decoder
  Detect byte-swapped AC-3 and support decoding it directly.
  cosmetics: indentation
  Always copy input data for AC3 decoder.
  ac3enc: make sym_quant() branch-free
  cosmetics: indentation
  Add a CPU flag for the Atom processor.
  id3v2: skip broken tags with invalid size
  id3v2: don't explicitly skip padding
  Make sure kbhit() is in conio.h
  fate: update wmv8-drm reference
  vc1: make P-frame deblock filter bit-exact.
  configure: Add the -D parameter to the dlltool command
  amr: Set the AVFMT_GENERIC_INDEX flag
  amr: Set the pkt->pos field properly to the start of the packet
  amr: Set the codec->bit_rate field based on the last packet
  rtsp: Specify unicast for TCP interleaved streams, too
  Set the correct target for mingw64 dlltool
  applehttp: Change the variable for stream position in seconds into int64_t
  ...

Conflicts:
	ffmpeg.c
	ffplay.c
	libavcodec/ac3dec.c
	libavformat/avio.h
	libavformat/id3v2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-23 02:42:56 +01:00
doc Merge remote-tracking branch 'newdev/master' 2011-03-21 03:33:28 +01:00
ffpresets Update qmin/qmax values for libx264 presets 2011-02-09 03:33:56 +01:00
libavcodec Merge remote-tracking branch 'newdev/master' 2011-03-23 02:42:56 +01:00
libavdevice Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
libavfilter Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
libavformat Merge remote-tracking branch 'newdev/master' 2011-03-23 02:42:56 +01:00
libavutil Merge remote-tracking branch 'newdev/master' 2011-03-23 02:42:56 +01:00
libpostproc Merge remote-tracking branch 'newdev/master' 2011-03-19 20:05:11 +01:00
libswscale Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
mt-work Fake-Merge remote-tracking branch 'ffmpeg-mt/master' 2011-03-22 22:36:57 +01:00
tests Merge remote-tracking branch 'newdev/master' 2011-03-23 02:42:56 +01:00
tools Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
.gitignore consolidate .gitignore patters into a single file 2011-01-18 21:32:05 +01:00
Changelog Merge remote-tracking branch 'newdev/master' 2011-03-17 17:22:52 +01:00
cmdutils_common_opts.h Implement a -pix_fmts option for listing all the supported pixel 2009-12-21 21:53:03 +00:00
cmdutils.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
cmdutils.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
common.mak Merge libavcore into libavutil 2011-02-16 23:00:30 +01:00
configure Merge remote-tracking branch 'newdev/master' 2011-03-23 02:42:56 +01: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 Merge remote-tracking branch 'newdev/master' 2011-03-19 20:05:11 +01:00
ffmpeg.c Merge remote-tracking branch 'newdev/master' 2011-03-23 02:42:56 +01:00
ffplay.c ffplay: Don't assume ic->pb is non-null 2011-03-21 15:08:09 -04:00
ffprobe.c ffprobe: tweak error message in open_input_file() 2011-03-21 16:45:21 +01:00
ffserver.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
ffserver.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
INSTALL Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
LICENSE Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
MAINTAINERS Bitmap Brothers JV errata 2011-03-11 12:25:47 +01:00
Makefile Merge remote-tracking branch 'newdev/master' 2011-03-19 20:05:11 +01:00
README Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
subdir.mak fix building test programs with gnu make 3.82 2010-12-07 16:42:25 +00:00
version.sh Merge remote-tracking branch 'newdev/master' 2011-03-19 20:05:11 +01:00

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.