1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00

1290 Commits

Author SHA1 Message Date
Stefano Sabatini
bd8e750300 Port drawtext filter by Hemanth from the libavfilter soc repo, with
the following additions:
* support to anti-aliased glyph rendering
* support to UTF-8 text and Unicode chars rendering
* support for RGB packed formats

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-02-22 01:49:45 +01:00
Brandon Mintern
704865fc87 lavfi: add fade filter
Port fade filter from libavfilter soc repo, with minor fixes by
Stefano.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-02-21 13:56:48 +01:00
Ronald S. Bultje
bbcaaf752f Update version and APIchanges.
Update libavformat/version.h and doc/APIChanges after renaming
init_put_byte() and ByteIOContext to ffio_init_context() (private)
and AVIOContext, (public), and deprecating the originals.
(cherry picked from commit d2bbf82e65e4a128ab1f0bf48df5d1e43c43c698)
2011-02-20 19:05:49 +01:00
Janne Grunau
b2f893acc8 Add SHA1s to APIChanges for av_dump_format, av_parse_time and av_find_info_tag
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit c3dbfa1afd7d989e3bba4c6bfc492a52c012e9b3)
2011-02-18 19:52:36 +01:00
Anton Khirnov
0ef52334ec lavf, lavu: bump minor versions and add an APIChanges entry for av_ prefixes
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 09d171b98879f58be1a766d5f277e131b18e98a1)
2011-02-18 19:52:34 +01:00
James Zern
728d56e84f documentation: add encoders chapter
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 0fa904c9d845d4a47372e619067e21991bb39b06)
2011-02-18 19:52:25 +01:00
Reinhard Tartler
7ffe76e540 Merge libavcore into libavutil
Done to keep ABI compatible. Otherwise this is just silly
2011-02-16 23:00:30 +01:00
Mans Rullgard
2f6c6a3462 APIchanges: update for 55bad0c: vbv_delay
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 8ed4cc65a19b5a6cc7ae6ed5072be2d3836dbeb2)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-02-16 02:08:13 +01:00
Anssi Hannula
d3c4829a0d APIchanges: update for 12c14cd
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 77c330a046d668373cbd9542f3e1d4746916b02f)
2011-02-15 16:32:32 +01:00
Mans Rullgard
3c9fcab554 apichanges: update for 24a83bd: add AV_DISPOSITION_CLEAN_EFFECTS flag
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 935ee1b9bba3d2fa1bf0d48eef278956307478cb)
2011-02-15 16:32:32 +01:00
Tilman Brock
ee028bbde9 Fix spelling error.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit b08f59dca493e7582ddfd08097c594bfb0ae6ff9)
2011-02-14 23:59:55 +01:00
Mans Rullgard
30391c6b5c Update APIchanges for 910b5b8
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 08a459f096106f13c03182eed4b7cb725dc4a0ae)
2011-02-14 23:59:55 +01:00
Stefano Sabatini
c906d974b7 Fix script command in a FAQ entry
In the FAQ section "How do I encode single pictures into movies?", use
-s for generating symbolic links with the ln command.

The script was generating hard links, which is not likely what it was
supposed to do.

Fix issue 2488.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit e063f5886b27a7374f5060b7c2c21385685b2cb0)
2011-02-13 00:54:06 +01:00
Stefano Sabatini
b423996b57 Update overlay documentation after movie syntax update.
Overlay documentation is still using the old unsupported syntax.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit aa8ac53b51cd8b9446b50404660685041060fa4f)
2011-02-13 00:52:51 +01:00
Peter Ross
547c67c935 Bink version 'b' video decoder
Based on original patch by Kostya Shishkov

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit e00f41d5742b3a0dc1877b030f4f6f58c19b7bbd)
2011-02-13 00:52:50 +01:00
Janne Grunau
4c2ce5900f document passing the fate samples location via make variable
(cherry picked from commit 5c19f64c600ece050a1deb27f53963e4416beb31)
2011-02-11 02:54:09 +01:00
Ronald S. Bultje
f94317fd07 Add missing git rev hash.
(cherry picked from commit f2146944fcd00a0a7918931c6f0f5c3f88cd6f1d)
2011-02-11 02:54:08 +01:00
Alexander Strange
043d2ff267 Deprecate avcodec_thread_init()
As a side effect of the last commit, avcodec_open() now calls it automatically,
so there is no longer any need for clients to call it.
Instead they should set AVCodecContext.thread_count.

avcodec_thread_free() is deprecated, and will be removed from avcodec.h at the
next MAJOR libavcodec bump.

Rename the functions to ff_thread_init/free, since they are now internal.
Wrappers are provided to maintain API compatibility.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit c0b102ca03fe92250f1ce620aec3836f529fc1d6)
2011-02-11 02:54:08 +01:00
Ronald S. Bultje
03e3cb8777 Add missing git rev hash.
(cherry picked from commit 8e8cc52be3b515bc91cd9452daca7a65feaea5ad)
2011-02-11 02:54:07 +01:00
Alexander Strange
b38f008ea6 Frame-based multithreading framework using pthreads
See doc/multithreading.txt for details on use in codecs.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-11 02:53:58 +01:00
Ronald S. Bultje
8a278ad30d Add missing git revision hask.
(cherry picked from commit c2bd7578af069206831a9c25fa68c9bbd5004619)
2011-02-11 02:43:49 +01:00
Anssi Hannula
070e5ba560 lavf: rename ff_probe_input_buffer to make it public
It is useful for applications that hand input data directly to lavf via
a ByteIOContext.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 3940caad02fbc4f075e77bc605849b1d84ba1b8e)
2011-02-09 03:33:55 +01:00
Reinhard Tartler
2eed5288d2 Documentation updates for the git migration
This cleanup patch updates the developer documentation with respect to
the migration to the git scm.
(cherry picked from commit 87800dc2bf8f2724a99e51bb079ad7fb4b9dfd3b)
2011-02-09 03:33:54 +01:00
Janne Grunau
17a1919027 add APIChanges entry for fe9a3fb
(cherry picked from commit 7ab8758baf743b3d525c07a770e13038b0885461)
2011-02-09 03:33:54 +01:00
Stefano Sabatini
9b8bb626dc libavfilter: add video movie source
See thread:
Subject: [PATCH] movie video source
Date: 2010-12-31 15:35:30 GMT

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-02-09 03:33:28 +01:00
Stefano Sabatini
a1cdf548a2 Apply misc fixes to the image2 muxer documentation.
The fixes were pointed out by Diego.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 0cad24ce9b02037c9cdad84cae905f96b04d7d4c)
2011-02-09 03:31:21 +01:00
Stefano Sabatini
20a4b9e936 Add documentation for the framecrc muxer.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 77d4ed7a127b88f9b8ddd741c65e678198feb285)
2011-02-09 03:31:21 +01:00
Stefano Sabatini
ea67c95176 Add documentation for the crc muxer.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit a4effe432f4aa59d52465b88589f92addf3afd3e)
2011-02-09 03:31:21 +01:00
Stefano Sabatini
7e7afb3d54 Document null muxer.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit f4acb837eb4af74996b678f3f55eaa66c47a66ee)
2011-02-09 03:31:21 +01:00
Kostya Shishkov
abb5f2b7bf Xan4 decoder
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 44ddfd47d671d2587903d94c8b565f68f45bd4bc)
2011-02-09 03:31:18 +01:00
Ronald S. Bultje
561ca02066 Fill in missing date.
(cherry picked from commit ae0f8a1a33158397c5014745424389ba1f543cfd)
2011-02-06 20:31:47 +01:00
Ronald S. Bultje
340a20ea65 Update MINOR and set git rev for non-blocking flag API addition.
(cherry picked from commit efdd67cb00ad770c16c47161c023121e1ae53ae9)
2011-02-06 20:31:47 +01:00
Nicolas George
f4bd5800ac Non-blocking protocols: flag and documentation
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit fe174fc8fc4bbdb050014a945de7eb9b28ba358e)
2011-02-06 20:31:46 +01:00
Martin Storsjö
8cf2d3d3d7 Add an APIchanges entry for avformat_free_context
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit ff1974897778942180c1d4f95b0b7b45a4fbbc02)
2011-02-06 20:31:44 +01:00
Tomas Härdin
e3bf3d533d Add APIchanges entry for lavc 52.109.0
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 75fd0668df64c4b7140be5ac829dee4e327a3e57)
2011-02-04 03:10:11 +01:00
Anton Khirnov
4a908866a1 ffmpeg.c: rename map_meta_data option to map_metadata
It's consistent with the -metadata option and easier to write.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 87e4d9b252bc6fa3b982f7050013069c9dc3e05b)
2011-02-04 03:10:09 +01:00
Anton Khirnov
e921bd57e3 Add forgotten minor API bumps and APIChanges entries
The bumps are for adding version.h and avio_{get/put}_str functions in
lavf and making av_dlog public in lavu.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-02-04 03:09:57 +01:00
Michael Niedermayer
7b3ea5507c Add sample_aspect_ratio fields to vsrc_buffer arguments.
This fixes aspect handling in ffmpeg
This is based on a patch by baptiste
2011-01-31 21:32:06 +01:00
Michael Niedermayer
14b171cd71 Add sample_aspect_ratio to AVFilterLink 2011-01-31 21:32:06 +01:00
Georgi Chorbadzhiyski
a735bbbb7a Replace defines in libavformat/mpegtsenc.c with AVOptions
Around 01/28/11 18:56, Ronald S. Bultje scribbled:
> That patch is now merged, can you submit the update to muxers.texi?
> Then we'll apply the whole thing.

See attached. I hope the documentation is enough.

--
Georgi Chorbadzhiyski
http://georgi.unixsol.org/

From c236024b8254f5c2c45934c30fff390cb0e55a5e Mon Sep 17 00:00:00 2001
From: Georgi Chorbadzhiyski <gf@unixsol.org>
Date: Tue, 25 Jan 2011 13:09:17 +0200
Subject: [PATCH] mpegts: Replace defines in with AVOptions

This patch adds support for setting transport_stream_id,
original_network_id, service_id, pmt_start_pid and start_pid
in mpegts muxer.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 445996aa51f4f1d9a26456a8511988291a720ba0)
2011-01-31 18:25:47 +01:00
Stefano Sabatini
29f22e049a Add documentation for the image2 muxer.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit e771d2e3fef4d2bcfc08b9eb37296f0e0af1f607)
2011-01-31 18:25:47 +01:00
Janne Grunau
5231d6277f doc: modify style for texi2html 1.78+
The generated HTML files are similar to the ones generated with
texi2html 1.56k used on the website.

Tested with texi2html 1.78 and 5.0. 1.78 is the minimal recommended
version.

The removed @sp from the titlepage section were ignored until
texi2html 5.0. If not removed the pages generated by 5.0 will have ugly
empty space around the title.
(cherry picked from commit a8f0814a742dee4783afaa5bedb01aa0c77b1fc4)
2011-01-30 03:41:47 +01:00
Stefano Sabatini
6219b67e84 Add muxers.texi file.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 85466e1e5f7f1fe50933d2d967a06b45b9222b5b)
2011-01-30 03:41:00 +01:00
Stefano Sabatini
e6d4019503 Amend documentation for the image2 demuxer, to better reflect the current behavior.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 10ed96c78fde80da9d5bac9b267369861a4f33ba)
2011-01-23 19:32:08 +01:00
Mike Scheutzow
ba0dd9e8ff streamid does not work with newaudio, newvideo, newsubtitle
fixes issue2465.

The problem is that the ffmpeg (the app) -streamid option did not work
with -newaudio/-newvideo/-newsubtitle.

The cause was a conflict between the feature where streamid values were
reset to default for each output filename, and the implementation of
-new*, which requires that the -new* option be specified after the
target filename.

My patch changes the ffmpeg behavior so that user-specified streamid
values apply to all the following output files on the command line
(rather than just the next output filename.)

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 20ac9de3df9b129a4a312d626fed0e2bbb760200)
2011-01-23 19:32:07 +01:00
Michael Niedermayer
fe67841355 Revert "Update git-howto with ffmpeg.org URLs"
This reverts commit 69c92320d760d3925d5c83c4fbca6012deef4195.

Reason is that this has been commited by mistake as discussed.
2011-01-19 19:06:32 +01:00
Mans Rullgard
69c92320d7 Update git-howto with ffmpeg.org URLs 2011-01-18 20:48:23 +00:00
Janne Grunau
2c3589bfda consolidate .gitignore patters into a single file
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-01-18 21:32:05 +01:00
Reimar Döffinger
54bc640362 Missing parts of IVF muxer support. 2011-01-18 08:00:23 +01:00
Reimar Döffinger
4aaeabcb6a Explain how to set up user name/email correctly for git. 2011-01-17 21:16:41 +01:00