FFmpeg git repo
Go to file
Michael Niedermayer 8ac0d95bd3 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  h264: avoid pointless copying of ref lists
  lavr: always reset mix function names and pointers in mix_function_init()
  lavr: call mix_function_init() in ff_audio_mix_set_matrix()
  fate: update ref after rv30_loop_filter fix
  rv30: fix masking in rv30_loop_filter()

Conflicts:
	tests/ref/fate/filter-delogo
	tests/ref/fate/rv30

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-18 13:54:38 +01:00
compat
doc examples/demuxing: free AVPacket after usage 2013-01-15 23:37:30 +01:00
libavcodec Merge remote-tracking branch 'qatar/master' 2013-01-18 13:54:38 +01:00
libavdevice Merge commit '80ac87c13dc8c6c063e26a464c5c542357c0583f' 2013-01-18 13:36:39 +01:00
libavfilter Merge commit 'dae1d507af94261bafd3b11549884e5d1eca590e' 2013-01-16 11:44:45 +01:00
libavformat Merge commit '80ac87c13dc8c6c063e26a464c5c542357c0583f' 2013-01-18 13:36:39 +01:00
libavresample Merge remote-tracking branch 'qatar/master' 2013-01-18 13:54:38 +01:00
libavutil Merge commit '80ac87c13dc8c6c063e26a464c5c542357c0583f' 2013-01-18 13:36:39 +01:00
libpostproc
libswresample
libswscale
presets
tests Merge remote-tracking branch 'qatar/master' 2013-01-18 13:54:38 +01:00
tools tools: add plotframes script 2013-01-15 22:50:19 +01:00
.gitignore .gitignore: add /doc/examples/pc-uninstalled 2013-01-17 17:59:18 +00:00
arch.mak
Changelog Merge commit '2f3bada63e57345329c4f9b48e9b81b5cfc03d05' 2013-01-15 16:05:34 +01:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure Merge commit '80ac87c13dc8c6c063e26a464c5c542357c0583f' 2013-01-18 13:36:39 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c Merge commit 'bff3607547fdbb6e32b3830a351e6a33280c1e0d' 2013-01-15 15:32:48 +01:00
ffmpeg.c Use new function av_codec_get_tag2() in ffmpeg.c. 2013-01-17 20:46:21 +01:00
ffmpeg.h
ffplay.c
ffprobe.c
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS
Makefile
README
RELEASE
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.