1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Go to file
Michael Niedermayer 78eaaa857e Merge commit 'fb1ddcdc8f51b9d261ae8e9c26b91e81f7b6bf45'
* commit 'fb1ddcdc8f51b9d261ae8e9c26b91e81f7b6bf45':
  avresample: Introduce AVFrame-based API

Conflicts:
	libavresample/utils.c
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-10 18:20:37 +02:00
compat compat/w32pthreads: add return value to pthread_cond_init(). 2014-05-26 11:33:42 +02:00
doc Merge commit 'fb1ddcdc8f51b9d261ae8e9c26b91e81f7b6bf45' 2014-08-10 18:20:37 +02:00
libavcodec hevc_ps: verify P/T/L information 2014-08-10 18:05:33 +02:00
libavdevice Merge commit '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8' 2014-08-10 00:26:45 +02:00
libavfilter lavfi: stop exporting internal functions 2014-08-10 04:51:19 +02:00
libavformat Merge commit '8c6f430291374cf6d2cfb85cdbb809803b5a7d83' 2014-08-10 02:20:54 +02:00
libavresample Merge commit 'fb1ddcdc8f51b9d261ae8e9c26b91e81f7b6bf45' 2014-08-10 18:20:37 +02:00
libavutil Merge commit 'fb1ddcdc8f51b9d261ae8e9c26b91e81f7b6bf45' 2014-08-10 18:20:37 +02:00
libpostproc bump libpostproc and libswresample 2014-08-10 01:17:02 +02:00
libswresample bump libpostproc and libswresample 2014-08-10 01:17:02 +02:00
libswscale Merge commit '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8' 2014-08-10 00:26:45 +02:00
presets presets: remove moldering iPod presets 2014-06-17 16:15:04 -08:00
tests avformat/matroskaenc: fix MAX_CUEPOINT_SIZE calculation 2014-08-09 05:05:09 +02:00
tools tools/fourcc2pixfmt: use avpriv_get_raw_pix_fmt_tags() 2014-08-10 04:50:31 +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 '444c73583d2848a542330c03949e1f933ac68f53' 2014-08-08 21:38:58 +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 Do not automatically map subtitles if the decoder and encoder properties are different. 2014-08-07 13:18:00 +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 use SWR_CH_MAX 2014-08-10 01:08:45 +02:00
ffplay.c replace calls to url_feof() with avio_feof() 2014-08-08 00:48:38 +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.