Clément Bœsch
6679fcd419
avformat/assdec: allow ASS files starting with empty lines
...
See https://github.com/mpv-player/mpv/issues/2506
9 years ago
wm4
265d2a73d6
avformat/assdec: do not drop duplicate subtitles
...
Duplicates are perfectly legitimate with this format. A correct
renderer will typically show them stacked.
9 years ago
Clément Bœsch
af924fd9e4
avformat/subtitles: forward log context in ff_subtitles_queue_finalize() for logging
9 years ago
Vittorio Giovara
1a3eb042c7
Replace av_dlog with normal av_log at trace level
...
This applies to every library where performance is not critical.
10 years ago
Vittorio Giovara
e9ba309831
assdec: check av_new_packet return value
...
CC: libav-stable@libav.org
Bug-Id: CID 703626
10 years ago
Carl Eugen Hoyos
19a6431ec2
Print a warning if a subtitle demuxer changes utf16 to utf8.
...
This does not fix anything but gives users a chance to
know that they must not pass -sub_charenc UTF-16 to ffmpeg.
Fixes ticket #4059 .
10 years ago
Clément Bœsch
d281a87ae3
avformat/assdec: typo fix
10 years ago
Clément Bœsch
138902dfb6
avformat/assdec: make sure pos is initialized
...
Fixes use of uninitialized memory
Fixes: signal_sigsegv_504fb0_10_signal_sigsegv_504fb0_343_mewmew_ssa.avi
Found-by: Mateusz j00ru Jurczyk and Gynvael Coldwind
10 years ago
Clément Bœsch
71f6275169
avformat/assdec: make sure to free allocated data in case of error
10 years ago
Clément Bœsch
3a6fa38fb1
avformat/assdec: add myself to Copyright
10 years ago
Clément Bœsch
0aa5c5a89e
avformat/assdec: reindent after previous commit
10 years ago
Clément Bœsch
9ec52e5533
avformat/assdec: make sure "Comments:" events end up in the header
10 years ago
Clément Bœsch
ff5f5cbb46
avformat/assdec: output ASS packets
...
After this the order from the original file is stored through readorder
when doing ffmpeg -i input.ass -c copy output.mkv.
And now that the ASS muxer honors the ReadOrder, extracting the ass back
(without transcoding) restores the original order.
10 years ago
wm4
3e8426170c
avformat/assdec: UTF-16 support
...
Use the UTF-16 BOM to detect UTF-16 encoding. Convert the file contents
to UTF-8 on the fly using FFTextReader, which acts as converting wrapper
around AVIOContext. It also can work on a static buffer, needed for
format probing. The FFTextReader wrapper now also takes care of skipping
the UTF-8 BOM.
Fix Ticket #3496 .
10 years ago
Patrice Clement
5c9c305d14
ass: K&R formatting cosmetics
11 years ago
Diego Biurrun
8f8bc92365
Add missing #includes for *INT64_MAX and *INT64_C
11 years ago
Clément Bœsch
67286fa98b
10l: export ff_bprint_to_extradata between libs using avpriv_ prefix.
...
Both libavformat and libavcodec requires this function.
12 years ago
Clément Bœsch
36e61e24e7
lavc: add ff_bprint_to_extradata() helper and use it.
...
This commit also makes sure the extradata and subtitle_header are NUL
terminated, without taking into account the trailing '\0' in account in
the size.
At the same time, it should fix 'warning: dereferencing type-punned
pointer will break strict-aliasing rules' warning for compilers who
don't consider uint8_t** and char** compatibles.
12 years ago
Clément Bœsch
6d2892c9f5
lavf/assdec: return appropriate error code instead of -1.
12 years ago
Clément Bœsch
069c897549
lavf/assdec: add ass_ prefix to callbacks.
12 years ago
Clément Bœsch
e0260e25b0
lavf/assdec: rewrite using the demux subtitles API.
12 years ago
Mans Rullgard
4cbae57cef
assdec: fix qsort() callback signature
...
This changes the event_cmp() function to the correct signature,
avoiding an ugly cast.
Signed-off-by: Mans Rullgard <mans@mansr.com>
12 years ago
Diego Biurrun
72eaba5e4f
avformat: Convert some commented-out printf/av_log instances to av_dlog
12 years ago
Anton Khirnov
36ef5369ee
Replace all CODEC_ID_* with AV_CODEC_ID_*
12 years ago
Nicolas George
93d428953c
assdec: return EOF instead of EIO.
12 years ago
Diego Biurrun
0177b7d23a
Improve descriptiveness of a number of codec and container long names
12 years ago
Diego Biurrun
6774247a9d
avformat: Drop pointless "format" from container long names
12 years ago
Anton Khirnov
6e9651d106
lavf: remove AVFormatParameters from AVFormatContext.read_header signature
13 years ago
Anton Khirnov
c3f9ebf743
lavf: make av_set_pts_info private.
...
It's supposed to be called only from (de)muxers.
13 years ago
Anton Khirnov
3b3bbdd3e6
lavf,lavd: replace av_new_stream->avformat_new_stream part I.
...
Trivial replacements with sed are done in this commit:
sed 's/av_new_stream(\([^)]*\), 0)/avformat_new_stream(\1, NULL)/'
13 years ago
Mans Rullgard
0ebcdf5cda
Do not include mathematics.h in avutil.h
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
14 years ago
Anton Khirnov
f5b386afab
Reemove remaining uses of deprecated AVERROR_NOTSUPP.
14 years ago
Mans Rullgard
2912e87a6c
Replace FFmpeg with Libav in licence headers
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
14 years ago
Anton Khirnov
66e5b1df36
avio: deprecate url_feof
...
AVIOContext.eof_reached should be used directly instead.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Anton Khirnov
471fe57e1a
avio: rename ByteIOContext to AVIOContext.
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit ae628ec1fd
)
14 years ago
Anton Khirnov
ae628ec1fd
avio: rename ByteIOContext to AVIOContext.
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Diego Elio Pettenò
66355be3c3
Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.
...
This also lists the objects from those two libraries as internal (by adding
the ff_ prefix) so that they can then be hidden via linker scripts.
(cherry picked from commit c6610a216e
)
14 years ago
Diego Elio Pettenò
c6610a216e
Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.
...
This also lists the objects from those two libraries as internal (by adding
the ff_ prefix) so that they can then be hidden via linker scripts.
14 years ago
Aurelien Jacobs
87d69d3232
use designated initializer in ASS (de)muxer
...
Originally committed as revision 25868 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Aurelien Jacobs
ac066b83e9
add seeking support in ASS demuxer
...
Originally committed as revision 24578 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Aurelien Jacobs
8a810ccbba
use return value of ff_get_line()
...
Originally committed as revision 24402 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Aurelien Jacobs
7c89295145
move ff_get_line to aviobuf.c
...
Originally committed as revision 24399 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Aurelien Jacobs
80769fb73f
rename get_line to ff_get_line
...
Originally committed as revision 24398 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Aurelien Jacobs
5c7ceef654
improve long_name for ass (de)muxer
...
Originally committed as revision 24084 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Jean-Daniel Dupas
cc947f04cc
Replace all occurences of PKT_FLAG_KEY with AV_PKT_FLAG_KEY.
...
Patch by Jean-Daniel Dupas, devlists shadowlab org
Originally committed as revision 22744 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Stefano Sabatini
72415b2adb
Define AVMediaType enum, and use it instead of enum CodecType, which
...
is deprecated and will be dropped at the next major bump.
Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Michael Niedermayer
8ba311410a
Silence "assdec.c:146: warning: passing argument 4 of ‘qsort’ from incompatible pointer type"
...
The alternative (schoolbook) solution is less readable.
Originally committed as revision 17230 to svn://svn.ffmpeg.org/ffmpeg/trunk
16 years ago
Aurelien Jacobs
7a8b7634c5
assdec: don't remove CR, they are part of the spec
...
Originally committed as revision 15442 to svn://svn.ffmpeg.org/ffmpeg/trunk
16 years ago
Michael Niedermayer
5c8a1d1927
Do not lose the '\n'.
...
Originally committed as revision 15424 to svn://svn.ffmpeg.org/ffmpeg/trunk
16 years ago
Michael Niedermayer
de3ae185a4
2 in 1, an ASS and SSA demuxer.
...
Tested with -scodec copy on all ASS & SSA samples that i found on mphq (exactly 2).
Originally committed as revision 15422 to svn://svn.ffmpeg.org/ffmpeg/trunk
16 years ago