RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
FFmpeg git repo
57,523 Commits 36 Branches 392 Tags 305 MiB
C 90.4%
Assembly 7.7%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
Go to file
Michael Niedermayer e5e048bbf7 avutil: reintroduce lls1 as the 52 ABI needs it 
lls1 taken from ff130d7

This is incompatible with libavcodec version
55.18.100 to 55.43.100 except 55.39.101
This incompatibility is caused by these libavcodec versions depending on
a libavutil 52 which is ABI incompatible with the previous ABI 52

you can avoid this incompatibility by upgrading your libavcodec so it
does no longer depend on the invalid ABI

See: 502ab21af0
See: cc6714bb16
See: 41578f70cf
See: Ticket3136
Tested-by: marillat
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b382d09d29)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 		2013-11-17 19:26:43 +01:00
compat Merge commit 'ef51692a49d58963966adca55c62da9c34c3c7e1' 2013-08-28 12:46:12 +02:00
doc update for 2.1 2013-10-28 01:35:03 +01:00
libavcodec rename new lls code to lls2 to avoid conflict with the old which has a different ABI 2013-11-17 19:12:29 +01:00
libavdevice avdevice/pulse_audio_enc: remove double ; 2013-10-28 00:52:11 +01:00
libavfilter libavfilter/vf_noise: relicense to LGPL 2013-10-27 20:29:07 +00:00
libavformat avformat/utils: never decrease has_b_frames in compute_pkt_fields() 2013-11-17 19:11:07 +01:00
libavresample Merge commit '206895708ea2b464755d340e44501daf9a07c310' 2013-10-14 15:54:23 +02:00
libavutil avutil: reintroduce lls1 as the 52 ABI needs it 2013-11-17 19:26:43 +01:00
libpostproc postprocess_template: put rsp on the clobber list to prevent gcc from using it in "q" 2013-06-16 18:21:39 +02:00
libswresample lswr/swresample: convert ocl and icl options to AV_OPT_TYPE_CHANNEL_LAYOUT 2013-10-17 18:09:54 +02:00
libswscale lsws: use av_pix_fmt_get_chroma_sub_sample() 2013-10-24 08:12:38 +02:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests FATE: update HEVC tests 2013-10-27 10:15:56 +01:00
tools Merge remote-tracking branch 'qatar/master' 2013-10-05 11:35:39 +02:00
.gitignore tools: add benchmark for crypto functions. 2013-09-04 16:36:11 +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
Changelog Changelog: add 2.1 2013-10-28 00:39:34 +01:00
INSTALL
…
LICENSE libavfilter/vf_noise: relicense to LGPL 2013-10-27 20:29:07 +00:00
MAINTAINERS MAINTAINERS: update which releases i maintain 2013-10-28 00:40:15 +01:00
Makefile Merge commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d' 2013-05-24 13:01:41 +02:00
README README: be a tiny bit more verbose 2012-04-06 10:23:26 +02:00
RELEASE update for 2.1 2013-10-28 01:35:03 +01:00
VERSION update for 2.1 2013-10-28 01:35:03 +01:00
arch.mak Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30' 2012-12-08 14:24:16 +01:00
cmdutils.c cmdutils: add -colors option 2013-10-27 09:18:45 +01:00
cmdutils.h cmdutils: add -colors option 2013-10-27 09:18:45 +01:00
cmdutils_common_opts.h cmdutils: add -colors option 2013-10-27 09:18:45 +01:00
common.mak Merge commit '47b6cfc2a0333fb24f074d27830bf35ae5007050' 2013-10-04 11:49:01 +02:00
configure libavfilter/vf_noise: relicense to LGPL 2013-10-27 20:29:07 +00:00
ffmpeg.c ffmpeg: Do not fill gap before the first decodable frame on single stream input files unless the user explicitly requests it. 2013-11-17 19:11:07 +01:00
ffmpeg.h ffmpeg: Do not fill gap before the first decodable frame on single stream input files unless the user explicitly requests it. 2013-11-17 19:11:07 +01:00
ffmpeg_filter.c ffmpeg_filter: Fix non jpeg yuv in jpeg support 2013-10-27 17:41:06 +01:00
ffmpeg_opt.c ffmpeg: Do not fill gap before the first decodable frame on single stream input files unless the user explicitly requests it. 2013-11-17 19:11:07 +01:00
ffplay.c ffplay: add support for libswresample options 2013-10-26 12:23:54 +02:00
ffprobe.c ffprobe: fix consistency checks in parse_read_intervals() 2013-10-21 13:33:06 +02:00
ffserver.c ffserver: strip odd chars from html error messages before sending them back 2013-10-09 00:30:46 +02:00
library.mak build: remove pointless condition 2013-10-24 10:51:03 +01:00
version.sh
…

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.