FFmpeg

mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-06-19 19:03:00 +02:00

T

Michael Niedermayer 21c7e99659 Merge commit 'a61c2115fb936d50b8b0328d00562fe529a7c46a'

* commit 'a61c2115fb936d50b8b0328d00562fe529a7c46a':
  configure: rework dxva in avconv handling

Conflicts:
	Makefile
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-04-29 01:47:53 +02:00

compat

Merge remote-tracking branch 'qatar/master'

2014-03-10 12:05:02 +01:00

doc

Merge commit '35177ba77ff60a8b8839783f57e44bcc4214507a'

2014-04-29 01:22:22 +02:00

libavcodec

Merge commit 'ed4b757177f9b563412cdbc8ee3405d82e10fc05'

2014-04-29 00:52:05 +02:00

libavdevice

Fix convertion typos

2014-04-29 00:09:08 +02:00

libavfilter

avfilter/graphdump: Fix pointer to local outside scope

2014-04-28 04:01:50 +02:00

libavformat

avformat/utils: Set the average frame rate from the r_frame_rate if the stream appears to be cfr

2014-04-28 18:51:15 +02:00

libavresample

Merge commit 'a24a252709dd38f12aa4929ce4981f87091a5113'

2014-04-25 01:19:27 +02:00

libavutil

Add AV_LOG_PRINT_LEVEL flag to include log severity in default log formatting.

2014-04-26 19:27:33 +02:00

libpostproc

Fix libpostproc compilation with !HAVE_6REGS.

2014-04-24 17:50:02 +02:00

libswresample

Fix convertion typos

2014-04-29 00:09:08 +02:00

libswscale

Fix teh typos

2014-04-27 15:16:13 +02:00

presets

presets: specify the codecs.

2012-05-04 18:40:36 +02:00

tests

avformat/utils: prevent r frame rate from being set larger than 1/tb

2014-04-28 15:49:51 +02:00

tools

tools/uncoded_frame: fix audio codec generation

2014-03-29 09:25:14 +01:00

.gitignore

examples: rename avcodec.c to decoding_encoding.c

2014-04-23 10:32:42 +02:00

arch.mak

Merge commit '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14'

2014-04-07 02:15:18 +02:00

Changelog

Merge commit '35177ba77ff60a8b8839783f57e44bcc4214507a'

2014-04-29 01:22:22 +02:00

cmdutils_common_opts.h

Allow hiding the banner.

2013-12-29 22:57:20 +01:00

cmdutils_opencl.c

cmdutils & opencl: add -opencl_bench option to test and show available OpenCL devices

2013-12-09 21:21:36 +01:00

cmdutils.c

cmdutils: preserve unchanged log flags when setting AV_LOG_SKIP_REPEATED

2014-04-26 19:21:59 +02:00

cmdutils.h

Merge commit '85698be461c07be10d873dd34348bcfe9ffc56e0'

2014-03-29 14:33:39 +01:00

common.mak

lavd: Add QTKit input device.

2014-03-30 20:45:07 +02:00

configure

Merge commit 'a61c2115fb936d50b8b0328d00562fe529a7c46a'

2014-04-29 01:47:53 +02:00

COPYING.GPLv2

…

COPYING.GPLv3

…

COPYING.LGPLv2.1

cosmetics: Delete empty lines at end of file.

2012-02-09 12:26:45 +01:00

COPYING.LGPLv3

…

CREDITS

CREDITS: redirect to Git log, remove current outdated content

2013-01-31 18:02:52 +01:00

ffmpeg_dxva2.c

Merge commit '35177ba77ff60a8b8839783f57e44bcc4214507a'

2014-04-29 01:22:22 +02:00

ffmpeg_filter.c

ffmpeg_filter: make *jpeg_formats static const

2014-04-28 00:22:38 +02:00

ffmpeg_opt.c

Merge commit 'a61c2115fb936d50b8b0328d00562fe529a7c46a'

2014-04-29 01:47:53 +02:00

ffmpeg_vdpau.c

Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'

2013-11-23 14:46:48 +01:00

ffmpeg.c

ffmpeg: print an error at the end if conversion failed

2014-04-29 00:09:08 +02:00

ffmpeg.h

Merge commit '35177ba77ff60a8b8839783f57e44bcc4214507a'

2014-04-29 01:22:22 +02:00

ffplay.c

avformat: add av_format_inject_global_side_data(), and disable it by default

2014-04-15 02:37:40 +02:00

ffprobe.c

ffprobe: fix scaling of vali in value_string() in case -prefix is selected

2014-04-23 10:32:42 +02:00

ffserver.c

ffserver: fix missing frees at connection setup

2014-04-25 19:49:55 -03:00

INSTALL

Merge remote branch 'qatar/master'

2011-04-08 02:50:13 +02:00

library.mak

Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90'

2014-02-17 02:22:01 +01:00

LICENSE

Add libx265 encoder

2014-02-12 13:13:17 +00:00

MAINTAINERS

MAINTAINERS: Add myself as FIC maintainer

2014-04-21 21:27:32 -04:00

Makefile

Merge commit 'a61c2115fb936d50b8b0328d00562fe529a7c46a'

2014-04-29 01:47:53 +02:00

README

README: be a tiny bit more verbose

2012-04-06 10:23:26 +02:00

RELEASE

Prepare for 11_alpha1 Release

2014-03-13 08:24:11 -04:00

version.sh

version.sh: add preprocessing guards

2013-11-30 21:42:03 +01:00

README

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.