RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-22 07:20:45 +00:00
Code Issues Projects Releases Wiki Activity
FFmpeg git repo
38,792 Commits 37 Branches 400 Tags 242 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
6968a7d193
Go to file
Michael Niedermayer 6968a7d193 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  doc/general: update supported devices table.
  doc/general: add missing @tab to codecs table.
  h264: Fix invalid interlaced/progressive MB combinations for direct mode prediction.
  avconv: reindent
  avconv: link '-passlogfile' option to libx264 'stats' AVOption.
  libx264: add 'stats' private option for setting 2pass stats filename.
  libx264: fix help text for slice-max-size option.
  http: Clear the auth state on redirects
  http: Retry auth if it failed due to being stale
  rtsp: Resend new keepalive commands if they used stale auth
  rtsp: Retry authentication if failed due to being stale
  httpauth: Parse the stale field in digest auth
  dxva2_vc1: pass the overlap flag to the decoder
  dxva2_vc1: fix decoding of BI frames
  FATE: add shorthand to wavpack test
  dfa: convert to bytestream2 API
  anm decoder: move buffer allocation from decode_init() to decode_frame()
  h264: improve parsing of broken AVC SPS

Conflicts:
	ffmpeg.c
	libavcodec/anm.c
	libavcodec/dfa.c
	libavcodec/h264.c
	libavcodec/h264_direct.c
	libavcodec/h264_ps.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-14 02:10:11 +01:00
doc Merge remote-tracking branch 'qatar/master' 2012-03-14 02:10:11 +01:00
ffpresets
libavcodec Merge remote-tracking branch 'qatar/master' 2012-03-14 02:10:11 +01:00
libavdevice alsa: fix timefilter usage. 2012-03-05 16:57:28 +01:00
libavfilter cosmetics: fix some typos 2012-03-13 01:14:04 +01:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-03-14 02:10:11 +01:00
libavutil Merge remote-tracking branch 'qatar/master' 2012-03-13 01:56:33 +01:00
libpostproc libpostproc: fix out of array accesses detected by AddressSanitizer. 2012-02-29 04:25:13 +01:00
libswresample cosmetics: fix some typos 2012-03-13 01:14:04 +01:00
libswscale Merge remote-tracking branch 'qatar/master' 2012-03-08 02:51:45 +01:00
mt-work
presets
tests Merge remote-tracking branch 'qatar/master' 2012-03-14 02:10:11 +01:00
tools Merge remote-tracking branch 'qatar/master' 2012-03-10 01:12:08 +01:00
.gitignore
Changelog lavfi: port MP swapuv filter 2012-03-10 00:10:37 +01:00
cmdutils_common_opts.h Merge remote-tracking branch 'qatar/master' 2012-03-07 03:22:49 +01:00
cmdutils.c Merge remote-tracking branch 'qatar/master' 2012-03-07 03:22:49 +01:00
cmdutils.h Merge remote-tracking branch 'qatar/master' 2012-03-07 03:22:49 +01:00
common.mak
configure Merge remote-tracking branch 'qatar/master' 2012-03-13 01:56:33 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg.c Merge remote-tracking branch 'qatar/master' 2012-03-14 02:10:11 +01:00
ffplay.c ffplay: fix two const warnings. 2012-03-08 17:13:58 +01:00
ffprobe.c
ffserver.c ffserver: add missing buffer set after rewrite av_open_input_file to avformat_open_input. 2012-03-12 03:31:59 +01:00
INSTALL
library.mak
LICENSE
MAINTAINERS cosmetics: fix some typos 2012-03-13 01:14:04 +01:00
Makefile
README
RELEASE
version.sh

README 

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.