virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
Mirror of https://git.ffmpeg.org/ffmpeg.git
64,321 Commits 37 Branches 400 Tags 465 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
ae9a73de2a
Go to file
Michael Niedermayer ae9a73de2a Merge commit '253d0be6a1ecc343d29ff8e1df0ddf961ab9c772' 
* commit '253d0be6a1ecc343d29ff8e1df0ddf961ab9c772':
  pgssubdec: handle more complex PGS scenarios

Conflicts:
	libavcodec/pgssubdec.c

Some of this has been split out and commited in cleanly split patches immedeately
before this merge

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-30 18:05:39 +02:00
compat compat/w32pthreads: add return value to pthread_cond_init(). 2014-05-26 11:33:42 +02:00
doc doc: remove trailing ':' at the end of sections 2014-06-30 15:36:26 +02:00
libavcodec Merge commit '253d0be6a1ecc343d29ff8e1df0ddf961ab9c772' 2014-06-30 18:05:39 +02:00
libavdevice lavd/avfoundation: Support user selected pixel formats and pixel format autoselection. 2014-06-12 21:31:25 +02:00
libavfilter avfilter/overlay: reindent 2014-06-29 13:26:12 +02:00
libavformat avformat/hdsenc: Use av_mallocz_array() 2014-06-30 05:08:33 +02:00
libavresample Merge commit 'b2d45654220503224aa94e78cdff19ec624e9342' 2014-05-29 01:23:22 +02:00
libavutil Merge commit '7b0c7c9163fe3dd0081696befde28617119d2590' 2014-06-28 21:31:18 +02:00
libpostproc Fix libpostproc compilation with !HAVE_6REGS. 2014-04-24 17:50:02 +02:00
libswresample swresample/resample_template: move division out of loop for float/double swri_resample_linear() 2014-06-30 04:30:10 +02:00
libswscale swscale/x86/input: prevent RGB32_TO_Y_FN from reading into the padding 2014-06-22 03:09:28 +02:00
presets presets: remove moldering iPod presets 2014-06-17 16:15:04 -08:00
tests avcodec/cavs: improve conformance with rm52j reference decoder 2014-06-28 19:53:41 +02:00
tools tools/fourcc2pixfmt: Avoid using non public AV_PIX_FMT_NB 2014-06-10 04:00:06 +02:00
.gitignore Merge commit '766f2d965ff1948749c37f26a714adb8aa89c4a9' 2014-06-16 13:04:41 +02:00
arch.mak Merge commit '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14' 2014-04-07 02:15:18 +02:00
Changelog avfilter: add hqx filter (hq2x, hq3x, hq4x) 2014-06-21 19:22:55 +02:00
cmdutils_common_opts.h ffmpeg: add -devices param 2014-05-28 03:52:50 +02:00
cmdutils_opencl.c ffmpeg: Use av_gettime_relative() 2014-05-19 02:35:07 +02:00
cmdutils.c cmdutils: ignore sws_flags if swscale is not enabled 2014-06-29 17:27:23 +02:00
cmdutils.h ffmpeg: add -devices param 2014-05-28 03:52:50 +02:00
common.mak Merge commit 'afe176265480880e1f702c96a8ba434b0d88728b' 2014-05-20 03:33:30 +02:00
configure configure: enable lto for icl compiler. 2014-06-29 19:24:12 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_dxva2.c Merge commit 'a7c5fddac8137654cb503295c4dfb6492df43643' 2014-04-30 00:46:38 +02:00
ffmpeg_filter.c ffmpeg: Fix choose_pixel_fmt() so it uses the correct encoding context 2014-06-01 17:16:08 +02:00
ffmpeg_opt.c ffmpeg_opt: route -ab to -b:a 2014-06-29 02:47:49 +02:00
ffmpeg_vda.c Merge commit '1839fafa951308237c4672ffd9a94f927b26eac7' 2014-05-12 02:44:28 +02:00
ffmpeg_vdpau.c
ffmpeg.c ffmpeg: fix deadlock regression in threading error handing 2014-06-27 17:45:38 +02:00
ffmpeg.h ffmpeg: support setting AVStream.discard 2014-06-07 21:26:22 +02:00
ffplay.c ffplay: decrease audio_diff_threshold 2014-06-24 21:59:21 +02:00
ffprobe.c ffprobe: add color_range and color_space to stream output 2014-06-24 00:35:16 +02:00
ffserver.c ffserver: don't leak poll_table if poll fails 2014-05-10 18:16:19 -04:00
INSTALL.md INSTALL: add markdown syntax 2014-05-28 22:38:38 +02:00
library.mak Merge commit 'b339182eba34f28de5f1a477cdd2c84f1ef35d90' 2014-02-17 02:22:01 +01:00
LICENSE.md LICENCE: add markdown syntax 2014-05-28 22:38:28 +02:00
MAINTAINERS avfilter: add hqx filter (hq2x, hq3x, hq4x) 2014-06-21 19:22:55 +02:00
Makefile Merge commit '5e2ba41d4b94de1fa5267081d6c4b6b262c8d86f' 2014-05-15 21:01:07 +02:00
README.md README: add markdown syntax 2014-05-28 22:38:11 +02:00
RELEASE RELEASE: update for 2.2 2014-03-01 17:09:12 +01:00
version.sh version.sh: add preprocessing guards 2013-11-30 21:42:03 +01:00

README.md

FFmpeg README

  1. Documentation
  1. Licensing
  • See the LICENSE file.
  1. Build and Install
  • See the INSTALL file.