1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Go to file
Michael Niedermayer c28aafe6c0 Merge remote-tracking branch 'cus/stable'
* cus/stable:
  ffplay: detect when the created overlay buffers are not valid for the wanted overlay height
  ffplay: do not allow wider window than 16383
  ffplay: use 0 frame delay if redisplaying an already displayed frame
  ffplay: use more sane frame timer resetting logic
  ffplay: only update pts if not redisplaying a frame
  ffplay: fix compute_target_delay to better handle frames with long durations
  ffplay: if playing only audio or video only, show the master clock diff in status line
  ffplay: factorize clock functions
  ffplay: decrease video picture queue size to 3

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-01 23:47:01 +02:00
compat os2threads: move from lavc to compat/ 2013-05-28 12:49:20 +02:00
doc lavfi/mp: drop mcdeint wrapper 2013-06-01 22:35:20 +02:00
libavcodec lavc/avcodec: decodimg → decoding. 2013-06-01 19:16:45 +02:00
libavdevice lavd: add xv output device 2013-05-30 10:44:54 +02:00
libavfilter lavfi/mp: drop mcdeint wrapper 2013-06-01 22:35:20 +02:00
libavformat lavf/webvttdec: factorize identifier and settings side data code. 2013-06-01 15:12:49 +02:00
libavresample Merge commit '006ec64877fb638de4b15ae5fd969e22bd0f60ca' 2013-05-18 11:25:58 +02:00
libavutil avutil/crc: Dont limit CRC32 standard tables 2013-06-01 10:53:39 +02:00
libpostproc postproc/postprocess_template: remove empty comments 2013-05-23 14:39:58 +02:00
libswresample swr/rematrix: use av_calloc() 2013-04-15 20:31:06 +02:00
libswscale add YUVJ411P 2013-05-21 12:56:11 +02:00
presets
tests tests: add mcdeint tests 2013-06-01 22:35:04 +02:00
tools tools/patcheck: fix misdetection with stuff like const_names 2013-05-23 19:11:28 +02:00
.gitignore Rename ffadler to ffhash and expand it using the generic hash API 2013-05-16 17:58:56 +02:00
arch.mak
Changelog lavfi: add vignette filter. 2013-05-30 17:52:52 +02:00
cmdutils_common_opts.h cmdutils_common_opts: fix indention of #if 2013-04-11 16:07:46 +02:00
cmdutils.c cmdutils: print slice threading flag in -filters. 2013-05-24 15:34:37 +02:00
cmdutils.h Merge commit 'e19e8aeeaaff3d4bc8f6065764c93f0298782ac6' 2013-04-12 15:56:20 +02:00
common.mak Merge commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975' 2013-03-28 12:12:38 +01:00
configure lavfi: port mcdeint filter from libmpcodecs 2013-06-01 22:34:57 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS CREDITS: redirect to Git log, remove current outdated content 2013-01-31 18:02:52 +01:00
ffmpeg_filter.c Merge commit '72fbc9685c08baae7ab9996642707eaab873b6f1' 2013-05-10 22:51:04 +02:00
ffmpeg_opt.c ffmpeg: add -apad option which injects a apad filter only in the presence of video streams 2013-05-08 23:55:06 +02:00
ffmpeg.c ffmpeg: use actual packet pts when discarding for the copypriorss option 2013-05-28 17:03:23 -04:00
ffmpeg.h ffmpeg: add -apad option which injects a apad filter only in the presence of video streams 2013-05-08 23:55:06 +02:00
ffplay.c ffplay: detect when the created overlay buffers are not valid for the wanted overlay height 2013-06-01 12:50:46 +02:00
ffprobe.c ffprobe: set writer context to 0 after allocation 2013-03-19 18:00:34 +01:00
ffserver.c ffserver: replace atoll() by strtoll() 2013-05-19 11:13:07 +02:00
INSTALL
library.mak Merge commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975' 2013-03-28 12:12:38 +01:00
LICENSE lavfi: port mcdeint filter from libmpcodecs 2013-06-01 22:34:57 +02:00
MAINTAINERS Support playing SMV files. 2013-05-22 15:20:22 +02:00
Makefile Merge commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d' 2013-05-24 13:01:41 +02:00
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.