virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-06-19 19:03:00 +02:00
Code Issues Releases Activity
44,890 Commits 39 Branches 425 Tags
3ceeb01c06d3f59cb2050052b840e48a6445f7e0
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Clément Bœsch 4390f8c28d Fix two "skiping" typo. 2012-09-25 07:42:32 +02:00
Clément Bœsch 2599541b3d WebVTT demuxer and decoder. 2012-09-23 15:24:08 +02:00
Clément Bœsch ea5bd7ea6f lavf/oggdec: check for begin-of-stream flag in case of chained streams. 
Fix Ticket #1617, revealing a regression I introduced in 8f3eebd.

We need to make sure no stream is added in between Ogg context save and
restore operations (because it would likely lead to a mismatch between
ogg->nstreams and AVFormatContext->nb_streams after the restore op).
This is the reason the ogg->state check is added in ogg_new_stream().
Before this patch, checking for ogg->headers was preventing this:
ogg->headers is always set before any ogg save/restore (though, it was
also preventing from creating the stream when necessary).
 2012-09-22 00:40:51 +02:00
Clément Bœsch 2f39d7ff3f lavfi/select: make lavc dependency optional. 2012-09-20 18:45:47 +02:00
Clément Bœsch b89c16e73e lavfi/select: make sure avctx is set before closing it. 
This avoid a crash when the filter fails before config_input(),
typically with a syntax error in the next filter:
    select=gt(scene\,.4),select=fail
 2012-09-18 18:52:57 +02:00
Clément BœschandJustin Ruggles ee0f53e966 alsdec: fix misplaced parentheses. 
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-09-17 14:17:27 -04:00
Clément BœschandAnton Khirnov 049ce4facb id3v2: strdup the genre name explicitly. 
It would have been done anyway in the av_dict_set() call.

This simplifies the code and avoid a warning because of assigning a
const string from ff_id3v1_genre_str to a non-const variable.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-09-17 15:48:20 +02:00
Clément BœschandAnton Khirnov ffdd2e9144 lavf/id3v2: do not export empty fields. 
This also avoids a memleak.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-09-17 15:48:20 +02:00
Clément Bœsch 094991eb69 lavf/oggdec: reword stream creation error message. 2012-09-16 18:28:52 +02:00
Clément Bœsch 23f6420026 lavf/oggdec: reindent and comment blocks. 2012-09-16 18:28:51 +02:00
Clément Bœsch a218c5ebd2 lavf/oggdec: make stream replacement less convoluted. 
Also re-use the allocated buffer instead of re-allocating a new one.
 2012-09-16 18:28:15 +02:00
Clément Bœsch e18ea76523 lavf/oggdec: more explicit zeroing of the new ogg stream. 2012-09-16 18:28:14 +02:00
Clément Bœsch 3a89553347 lavf/oggdec: rework allocations in ogg_new_streams(). 2012-09-16 18:27:58 +02:00
Clément Bœsch edca80387c lavf/oggdec: simplify destroying streams with chained audio streams. 
nstreams is assumed to be 1 at that point, so the loop is pointless.
 2012-09-16 16:52:06 +02:00
Clément Bœsch 277ddf127d lavf/oggdec: rename str to sid. 
"str" is misleading here (it's often used for string). "sid" makes more
sense to identify a stream id.
 2012-09-16 16:52:06 +02:00
Clément Bœsch e1ca1dd71b lavf/oggdec: remove a comment not matching anything. 2012-09-16 16:52:06 +02:00
Clément Bœsch bf8bfc6a11 lavf/oggdec: inline ogg_get_headers(). 
There is no point in a distant definition of a small function like this
used only once.

Additional spacing to distinguish better the block.
 2012-09-16 16:52:06 +02:00
Clément Bœsch d214e5cfb4 lavc/ass_split: add ff_ prefix to ass_style_get(). 2012-09-16 03:05:01 +02:00
Clément Bœsch 74434d3bfe lavfi/ass: mark ass_libavfilter_log_level_map as static const. 2012-09-16 02:59:43 +02:00
Clément Bœsch ca81e3b6e7 lavf/mkv: prefix video stereo arrays with ff_. 2012-09-16 02:58:40 +02:00
Clément Bœsch 8b05220727 lavu/error: make error_entries static const. 2012-09-16 02:53:32 +02:00
Clément BœschandAnton Khirnov ca8e39dd0d mp3enc: support MPEG-2 and MPEG-2.5 in Xing header. 2012-09-15 18:25:22 +02:00
Clément Bœsch bbae8cdf4d lavfi/amerge: avoid a forward declaration. 2012-09-11 18:38:09 +02:00
Clément Bœsch 7b56dddd56 lavfi/amerge: fix input pad name behaviour. 
This fixes two problems:
 - the invalid pad.name stack pointer after init() ends
 - the duplicated name for all inputs
 2012-09-11 14:59:23 +02:00
Clément Bœsch 5620088494 lavf: fix a few typo in some comments. 2012-09-05 23:22:35 +02:00
Clément Bœsch 9d9f34a3c1 lavf: remove a few useless AV_NOWARN_DEPRECATED(). 
read_seek was undeprecated in e5c708151.
 2012-09-05 23:18:07 +02:00
Clément Bœsch 3b6e9cd7ec lavc/dvdsubdec: parse the size from the extradata. 2012-09-04 23:38:29 +02:00
Clément Bœsch c149586884 gitignore: add scaling_video example. 2012-08-28 20:35:04 +02:00
Clément Bœsch 26ec392a0e lavf: remove unused AVStream pointer. 2012-08-21 13:48:08 +02:00
Clément Bœsch 3dba9e19c8 lavf: add const qualifier to AVCodecDescriptor pointer in is_intra_only(). 
Fix "assignment discards ‘const’ qualifier from pointer target type" warnings.
 2012-08-21 13:47:43 +02:00
Clément Bœsch 3899e49955 lavfi/edgedetect: use "@see" instead of the invalid "@url". 2012-08-20 23:12:34 +02:00
Clément Bœsch ddda29b4a7 lavfi: add showspectrum filter. 2012-08-20 23:03:06 +02:00
Clément Bœsch 517a2bbcf1 lavfi/edgedetect: add rounding for high/low threshold. 
This should fix the 32-bit FATE instances where low_u8=19 and high_u8=49.
 2012-08-17 08:08:07 +02:00
Clément Bœsch 3250231a02 lavfi: add edgedetect filter. 2012-08-16 22:03:32 +02:00
Clément Bœsch cc650cf029 Remove "Error parsing options string [...]" messages. 
This reduces from 3 to 2 messages for the same syntax error in ffprobe,
and from 4 to 3 in filters.
 2012-08-09 08:11:00 +02:00
Clément Bœsch cb5bb521aa lavf/movenc: use two explicit bytes instead of a short. 
This also avoids a pointless cast.

Idea-by: Reimar Döffinger
 2012-08-08 23:13:52 +02:00
Clément Bœsch e6dd2852ca lavfi/atempo: remove dead increment. 2012-08-08 22:53:00 +02:00
Clément Bœsch cf753d5b59 doc: fix misspelled "convergence". 
Found-by: David Rice
 2012-08-07 07:37:39 +02:00
Clément Bœsch 16dc5f2050 Replace various inlined inverse AVRational with av_inv_q(). 2012-08-06 00:04:36 +02:00
Clément Bœsch ad55244c96 lavfi/overlay: remove dead initialization. 2012-08-06 00:04:36 +02:00
Clément Bœsch 53a3748ed2 ffmpeg: honor -ss and -t parameters with muxed subtitles. 
This patch fixes two things:

 - in case of subtitles, check_recording_time() is comparing the current
   PTS to the recording time (-t option, set to INT_MAX by default), so
   the -ss option needs to be taken into account. It is not required in
   do_{audio,video}_out() because this adjustment is set while polling
   the filtergraph (see poll_filters()).

 - It also adjusts the PTS sent to the encoder (and later transmitted to
   the muxer) so the TS in the output make sense and are not kept
   verbatim.

Note: this only works for muxers honoring the PTS, such as
lavf/matroskaenc. But for other such as the ASS muxer which just does a
verbatim copy, or the SubRip muxer which doesn't write the TS in some
cases, it will not work yet.
 2012-08-01 20:37:34 +02:00
Clément Bœsch 316f8db2c2 SubViewer demuxer and decoder. 2012-07-26 22:22:54 +02:00
Clément Bœsch 2755abff3e lavc/rt: small wording fix in a comment. 2012-07-26 22:22:49 +02:00
Clément BœschandDerek Buitenhuis 61884b9d1b wav: init st to NULL to avoid a false-positive warning. 
If st is NULL, it means no 'fmt ' tag is found, but 'data' tag (which
needs a previous 'fmt ' tag to be parsed correctly and st initialized)
check will make sure st is never dereferenced in that case.

Fixes warning:
    libavformat/wav.c: In function ‘wav_read_header’:
    libavformat/wav.c:499:44: warning: ‘st’ may be used uninitialized in this function [-Wmaybe-uninitialized]

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2012-07-23 11:34:08 -04:00
Clément Bœsch 55ed91c856 threads: fix a potential race spotted by helgrind. 2012-07-19 19:08:36 +02:00
Clément Bœsch 652887d6fd fate/subtitles: sort tests alphabetically. 2012-07-19 19:07:10 +02:00
Clément Bœsch 7073174551 x86inc: put basicnop under ifdef to prevent compile failure. 
This should fix the NASM box.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-07 22:48:43 +02:00
Clément Bœsch 7c84e7d337 mem: heap memory poisoning. 
Enable it by default with FATE.
limitation: not random, and not supported with realloc.
 2012-07-02 21:02:15 +02:00
Clément Bœsch c855ce2671 lavf/wtvdec: add missing { } around if. 
This should fix the current failures spotted by FATE.
 2012-07-02 15:09:53 +02:00
Clément Bœsch ca612a27ae swr: fix make checkheaders. 2012-06-30 11:21:53 +02:00
Clément Bœsch 022cbb6791 swr: small align cosmetic. 2012-06-30 11:18:45 +02:00
Clément Bœsch 3491c2a909 swr: use __asm__ instead of __asm. 
For consistency only.
 2012-06-30 11:18:05 +02:00
Clément Bœsch 439e32f9b8 RealText demuxer and decoder. 2012-06-29 20:22:04 +02:00
Clément Bœsch 53640f42be SAMI demuxer and decoder. 2012-06-29 20:21:28 +02:00
Clément Bœsch d948893dbd lavf/subtitles: add some SMIL helpers. 
This is needed for SAMI and RealText demuxers.
 2012-06-29 20:20:02 +02:00
Clément Bœsch e301f2f8c6 fate: add JacoSUB and MicroDVD subtitles tests. 2012-06-29 20:20:02 +02:00
Clément Bœsch 04568f8d1a fate: introduce subtitles.mak and move SubRip test in it. 2012-06-29 20:20:02 +02:00
Clément Bœsch 8f4ce626f8 lavc/microdvddec: support "DEFAULT" properties. 2012-06-29 20:20:02 +02:00
Clément Bœsch 0e7782c08e lavc/ass: honor Default style. 
The "Default" style written in the header is ignored unless you explicit
it in the Dialogue events (it was valid, just ignored). This requires an
update of the SubRip test since the ASS output obviously changes.
 2012-06-29 20:20:02 +02:00
Clément Bœsch a19e9f2d5c lavf/microdvd: rewrite using subtitles queue API. 2012-06-29 20:20:01 +02:00
Clément Bœsch 0ef28e119e lavf/jacosubdec: fix FPE in case timeres is badly set. 2012-06-29 20:19:59 +02:00
Clément Bœsch 60715511db lavf/jacosubdec: use subtitles queue API. 2012-06-29 19:13:25 +02:00
Clément Bœsch 7c9f9685ae lavf: add internal demuxer helpers for subtitles. 2012-06-29 19:13:24 +02:00
Clément Bœsch f926d91611 ffmpeg: fix a memleak in subtitles decoding. 2012-06-29 19:13:24 +02:00
Clément Bœsch 492cc9bcc4 ffmpeg: remove unused buffer_size in InputFile. 2012-06-22 22:13:22 +02:00
Clément Bœsch 20a6fa77a6 doc: add two similar overlay "side-by-side" examples. 2012-06-17 13:20:04 +02:00
Clément Bœsch c7bdfbe79f MAINTAINERS: add my GPG fingerprint. 2012-06-16 02:50:00 +02:00
Clément Bœsch b678daf05c lavc/microdvddec: fix color parsing. 2012-06-15 18:42:10 +02:00
Clément Bœsch 47395a4f52 lavc/microdvddec: properly reset non persistent color tag. 2012-06-15 18:41:14 +02:00
Clément Bœsch 608bda925a lavf/{srt,microdvd}: correctly raise error on avformat_new_stream() error. 2012-06-15 18:40:14 +02:00
Clément Bœsch 44be67595d lavfi/select: use exported dsputil_init function. 
This is the deprecated version of the function but it is exported, so it
should fix the shared FATE box.
 2012-06-05 07:29:00 +02:00
Clément Bœsch 13a7bd70c8 lavfi/select: 10l: llabs -> fabs after switching types. 2012-06-05 00:17:38 +02:00
Clément Bœsch df03ae8dd8 ffmpeg: remove two unused variables. 2012-06-04 22:32:26 +02:00
Clément Bœsch 5e8225004f Changelog: add ffprobe flat output. 2012-06-04 21:46:24 +02:00
Clément Bœsch 72868144e5 lavfi/select: add scene detection. 
Based on the shotdetect algorithm (http://shotdetect.nonutc.fr/ by Johan
MATHE johan.mathe tremplin-utc.net).
 2012-06-04 21:44:34 +02:00
Clément Bœsch bae99f7651 ffprobe/flat: add escape for '`' and '$'. 2012-06-04 19:15:39 +02:00
Clément Bœsch fd0c83c666 ffprobe: add flat output format. 2012-06-01 21:06:06 +02:00
Clément Bœsch db839544d6 ffprobe/xml: use writer multiple_sections instead of local context variable. 2012-06-01 20:52:30 +02:00
Clément Bœsch 2248db946c ffprobe: move packets_and_frames work to writer context. 2012-06-01 20:52:30 +02:00
Clément Bœsch 64df092b25 swr: fix a few typo. 2012-06-01 08:06:36 +02:00
Clément Bœsch 303619d3ca jacosub_probe: slightly increase the score to limit misdetection. 2012-05-31 22:12:46 +02:00
Clément Bœsch 908293d1bc jacosub_probe: speedup by making only one call to sscanf 2012-05-31 21:55:35 +02:00
Clément Bœsch 8619362ff1 ffprobe: fix C escaping. 2012-05-30 01:07:41 +02:00
Clément Bœsch 2d52ee8a1a lavf/microdvd: support events lasting to the next one. 
Example:

{3350}{}this subtitle...
{3390}{}...continues up to...
{4000}{4500}this one.
{4600}{}and now...
{4800}{}...to the end of the presentation
 2012-05-29 21:33:28 +02:00
Clément Bœsch d51e08bb89 lavc: switch from ts_end to duration in ff_ass_add_rect. 
Make possible a end-to-presentation duration.
 2012-05-29 21:33:28 +02:00
Clément Bœsch dae8505492 ffprobe: make -of an alias for -print_format. 
This is for interoperability purpose with the fork.
 2012-05-29 18:50:20 +02:00
Clément Bœsch f0c15ecd45 doc/syntax: escape '@' to fix a warning. 
Fix the following warning:
doc/syntax.texi:147: warning: Accent command `@"' must not be followed by whitespace
 2012-05-29 07:40:58 +02:00
Clément Bœsch d187e7616e ffmpeg: use %f instead of %lf in volume args format printf. 
%f refers to a double argument already.
 2012-05-28 22:17:05 +02:00
Clément Bœsch 80bf2b6e84 Changelog: fix wrong/inaccurate entries. 2012-05-27 15:28:24 +02:00
Clément Bœsch 5c3f79198c lavfi/deshake: add libavcodec dependency (dsputil). 2012-05-27 00:34:09 +02:00
Clément Bœsch 19c1bf1525 ffprobe: reduce the number of AVBPrint resets. 2012-05-26 22:53:13 +02:00
Clément Bœsch b0b7a89b07 lavfi/aresample: print channel layouts and formats along with the rate. 2012-05-25 07:26:48 +02:00
Clément Bœsch ba4aa656ce doc/filters: move "aformat" before "amerge". 2012-05-24 23:55:32 +02:00
Clément Bœsch 42b2908d7b doc/filters: remove old aformat entry. 
The new description is still available below.
 2012-05-24 23:55:28 +02:00
Clément Bœsch 781fb46c56 lavfi/video: add avfilter.h include to fix make checkheaders. 2012-05-24 23:46:15 +02:00
Clément Bœsch d8e075b1a0 ffmpeg: use AUTO_INSERT_FILTER() for -async option. 2012-05-24 23:33:21 +02:00
Clément Bœsch e5fcf3646a lavf/id3v2: always strdup the value. 
This simplifies the code but also fix a warning: ff_id3v1_genre_str
array contains const strings so do the string dup now instead of in
av_dict_set().
 2012-05-19 12:29:30 +02:00
Clément Bœsch 6ad974ae1c lavf/id3v2: do not export empty fields. 
This also avoids a memleak.
 2012-05-19 12:29:30 +02:00
Clément Bœsch 4fd573970a doc/examples: make use of the parameter filters_descr parameter in init_filters(). 2012-05-19 12:29:05 +02:00
Clément Bœsch 0cc9ee5fab doc/examples: install them with the shared data. 2012-05-19 12:28:59 +02:00