1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Go to file
Michael Niedermayer 00d2346885 Merge commit '15201e256035a3e8f9d3d7b96fc327467e1a8ead'
* commit '15201e256035a3e8f9d3d7b96fc327467e1a8ead':
  configure: check $as first before using $gas as GNU as

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-05 19:31:08 +02:00
compat compat/w32pthreads: add return value to pthread_cond_init(). 2014-05-26 11:33:42 +02:00
doc avfilter/avf_showwaves: New p2p mode for showwaves filter 2014-08-05 14:12:35 +02:00
libavcodec Merge commit '701e8b42e12ad625c64ceae2252acb1de390278c' 2014-08-05 13:37:07 +02:00
libavdevice lavd/avfoundation: Add device category. 2014-08-05 01:36:26 +02:00
libavfilter avfilter/vf_noise: make constant things const 2014-08-05 17:04:13 +02:00
libavformat avformat/iff: Fix "source comment" 2014-08-05 18:16:46 +02:00
libavresample Merge commit 'fbc0b8659967ea54a8472b5f795270d38bb085dd' 2014-08-04 02:49:48 +02:00
libavutil Fix compile error on bfin. 2014-08-05 01:54:47 +02:00
libpostproc Fix libpostproc compilation with !HAVE_6REGS. 2014-04-24 17:50:02 +02:00
libswresample swresample/swresample: Treat mono as planar 2014-08-04 03:05:05 +02:00
libswscale swscale/swscale_internal: fix ya16 -> rgba 2014-08-05 01:51:11 +02:00
presets presets: remove moldering iPod presets 2014-06-17 16:15:04 -08:00
tests Merge commit 'd395895cdb2ac8c95bd488549e7f893bd4dcc248' 2014-08-05 19:10:51 +02:00
tools tools/yuvcmp: add HAVE_UNISTD_H around #include <unistd.h> 2014-07-08 01:56:33 +02:00
.gitignore Merge commit '706208ef47bffd525c982975d2756f7b2b220b8d' 2014-08-01 15:03:22 +02:00
arch.mak Merge commit '8675bcb0addb1c7fb0b04682d1f3f95d5b8dae14' 2014-04-07 02:15:18 +02:00
Changelog libavformat: Add Icecast protocol 2014-08-04 13:33:44 +02:00
cmdutils_common_opts.h ffmpeg: add -devices param 2014-05-28 03:52:50 +02:00
cmdutils_opencl.c cmdutils_opencl: Use av_malloc_array() 2014-07-01 03:49:36 +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 Merge commit '15201e256035a3e8f9d3d7b96fc327467e1a8ead' 2014-08-05 19:31:08 +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 'a7c5fddac8137654cb503295c4dfb6492df43643' 2014-04-30 00:46:38 +02:00
ffmpeg_filter.c ffmpeg_filter: refuse to configure input without a decoder. 2014-07-30 14:40:45 +02:00
ffmpeg_opt.c ffmpeg: Do not fail if a demuxer and decoder use the same option identifer 2014-08-04 13:33:44 +02:00
ffmpeg_vda.c Merge commit '1839fafa951308237c4672ffd9a94f927b26eac7' 2014-05-12 02:44:28 +02:00
ffmpeg_vdpau.c Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea' 2013-11-23 14:46:48 +01:00
ffmpeg.c ffmpeg: Do not fail if a demuxer and decoder use the same option identifer 2014-08-04 13:33:44 +02:00
ffmpeg.h ffmpeg: Do not fail if a demuxer and decoder use the same option identifer 2014-08-04 13:33:44 +02:00
ffplay.c ffplay: increase subtitle que size 2014-07-12 16:29:03 +02:00
ffprobe.c ffprobe: print some basic information about avframe side data 2014-07-30 19:23:08 +02:00
ffserver.c ffserver: initialize pbuffer in prepare_sdp_description() 2014-08-02 18:32:37 +02:00
INSTALL.md INSTALL: add markdown syntax 2014-05-28 22:38:38 +02:00
library.mak Merge commit 'bb0babd7054bed7edfd9f4d6b20cdba864de1830' 2014-07-22 02:45:45 +02:00
LICENSE.md LICENCE: add markdown syntax 2014-05-28 22:38:28 +02:00
MAINTAINERS MAINTAINERS: update list of releases i maintain 2014-07-28 06:16:34 +02:00
Makefile Merge commit 'd45ebd4876ab8fc07736a644de07e1b1d11a8e5d' 2014-07-22 03:06:43 +02:00
README.md README: add markdown syntax 2014-05-28 22:38:11 +02:00
RELEASE RELEASE: update, we are after 2.3 not 2.2 2014-07-28 03:11:04 +02:00
RELEASE_NOTES RELEASE_NOTES: fix WebVTT decoder typo (-> encoder) 2014-07-25 13:22:00 +02:00
version.sh version.sh: Print versions based on the last git tag for release branches 2014-07-28 15:44:59 +02:00

FFmpeg README

  1. Documentation

  1. Licensing

  • See the LICENSE file.
  1. Build and Install

  • See the INSTALL file.