bc9a5965c8
Merge commit '9f61abc8111c7c43f49ca012e957a108b9cc7610'
...
This also deprecates our old duplicated callbacks.
* commit '9f61abc8111c7c43f49ca012e957a108b9cc7610':
lavf: allow custom IO for all files
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-10 14:42:41 +00:00
1dba8371d9
avformat: add protocol_whitelist
...
Note to maintainers: update tools
Note to maintainers: set a default whitelist for your protocol
If that makes no sense then consider to set "none" and thus require the user to specify a white-list
for sub-protocols to be opened
Note, testing and checking for missing changes is needed
Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-02 03:39:34 +01:00
3130556c0e
avformat: Document urls a bit
...
Spell-checked-by: Moritz Barsnick <barsnick@gmx.net >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-01-24 16:52:10 +01:00
9f61abc811
lavf: allow custom IO for all files
...
Some (de)muxers open additional files beyond the main IO context.
Currently, they call avio_open() directly, which prevents the caller
from using custom IO for such streams.
This commit adds callbacks to AVFormatContext that default to
avio_open2()/avio_close(), but can be overridden by the caller. All
muxers and demuxers using AVIO are switched to using those callbacks
instead of calling avio_open()/avio_close() directly.
(de)muxers that use the URLProtocol layer directly instead of AVIO
remain unconverted for now. This should be fixed in later commits.
2016-01-24 16:45:32 +01:00
41e07390e0
avformat/avformat: Replace some references to filenames by urls
...
Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-01-21 02:57:10 +01:00
2039b3e751
avformat: Add integer fps from 31 to 60 to get_std_framerate()
...
Fixes Ticket 5106
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-01-09 15:21:34 +01:00
1f9139b07b
lavf: add automatic bitstream filtering; bump version
...
This solves the problem discussed in https://ffmpeg.org/pipermail/ffmpeg-devel/2015-September/179238.html
by allowing AVCodec::write_header to be delayed until after packets have been
run through required bitstream filters in order to generate global extradata.
It also provides a mechanism by which a muxer can add a bitstream filter to a
stream automatically, rather than prompting the user to do so.
2015-12-28 08:40:35 -06:00
4caa3e1c6c
lavf: add API to apply a list of bsfs to a packet
2015-12-28 08:34:30 -06:00
fc5e39544b
lavf/avformat: add av_warn_unused_result to avformat_write_header
...
May be useful as a defense, see e.g c62d1780ffgajjanagadde@gmail.com >
2015-12-21 08:39:57 -08:00
676a93f2d8
avformat: Add av_program_add_stream_index()
...
This will be used by the subsequent commit(s)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2015-12-11 22:27:25 +01:00
ad317c94c5
Merge commit '7f4ec4364bc4a73036660c1c6a3c4801db524e9e'
...
* commit '7f4ec4364bc4a73036660c1c6a3c4801db524e9e':
avformat: expose av_stream_new_side_data helper
Conflicts:
libavformat/internal.h
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2015-11-22 17:19:10 +00:00
2bf93dfd96
Merge commit '21ab6fd01b9107d7171fc1a77c2bfacff845a97a'
...
* commit '21ab6fd01b9107d7171fc1a77c2bfacff845a97a':
lavf: document that passing valid timestamps to muxers is now mandatory
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2015-11-22 17:16:13 +00:00
7f4ec4364b
avformat: expose av_stream_new_side_data helper
...
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2015-11-18 11:36:27 +01:00
21ab6fd01b
lavf: document that passing valid timestamps to muxers is now mandatory
...
Also, extend the documentation about setting timestamps.
2015-11-18 11:31:40 +01:00
611c22140a
Merge commit '8de1ee9f725aa3c550f425bd3120bcd95d5b2ea8'
...
* commit '8de1ee9f725aa3c550f425bd3120bcd95d5b2ea8':
lavf: deprecate compute_pkt_fields2
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2015-11-11 14:37:48 +01:00
8de1ee9f72
lavf: deprecate compute_pkt_fields2
...
All encoders set pts and dts properly now (and have been doing that for
a while), so there is no good reason to do any timestamp guessing in the
muxer.
The newly added AVStreamInternal will be later used for storing all the
private fields currently living in AVStream.
2015-11-09 07:50:55 +01:00
7f5af80ba4
Merge commit 'ce70f28a1732c74a9cd7fec2d56178750bd6e457'
...
* commit 'ce70f28a1732c74a9cd7fec2d56178750bd6e457':
avpacket: Replace av_free_packet with av_packet_unref
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2015-10-27 14:28:56 +01:00
ce70f28a17
avpacket: Replace av_free_packet with av_packet_unref
...
`av_packet_unref` matches the AVFrame ref-counted API and can be used as
a drop in replacement.
Deprecate `av_free_packet`.
2015-10-26 18:00:55 +01:00
1899b25799
Merge commit '34ed5c2e4d9b7fe5c9b3aae2da5599fabb95c02e'
...
* commit '34ed5c2e4d9b7fe5c9b3aae2da5599fabb95c02e':
avformat: Do not use AVFMT_RAWPICTURE
Removal from ffmpeg.c not merged because some parts of avdevice
still use it
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2015-10-14 14:43:20 +02:00
34ed5c2e4d
avformat: Do not use AVFMT_RAWPICTURE
...
There are no formats supporting it anymore and it is deprecated.
Update the documentation accordingly.
2015-10-13 13:43:29 +02:00
655b6dcb34
lavc/lavf: remove incompatible abi checks for the new 64bit fields
...
Reviewed-by: Michael Niedermayer <michaelni@gmx.at >
Signed-off-by: James Almer <jamrial@gmail.com >
2015-09-17 11:36:16 -03:00
b290972b8f
lavf: Switch probesize and max_analyze_duration to 64bit.
...
Both are only accessible through AVOptions.
2015-09-15 18:02:51 +02:00
c311713ca9
lavf: Switch bitrate to 64bit unless compatibility with avconv was requested.
...
Based on a patch by Steve Swanson, swanysteve at gmail.
Fixes ticket #2089 .
2015-09-15 18:02:47 +02:00
67d81b76b6
avformat/avformat: remove dead code
...
Signed-off-by: James Almer <jamrial@gmail.com >
2015-09-09 20:12:16 -03:00
670d8ecfae
lavf: Remove probesize32 and max_analyze_duration32 on version bump.
...
Add FF_API_PROBESIZE_32 to allow removing 32bit probesize and 32bit
max_analyze_duration after the next libavformat version bump.
2015-09-01 09:19:49 +02:00
b4d68e7cdb
avformat: Remove use of AVFrac and AVStream->pts
...
Move field to internal part of AVStream and struct to internal.h
Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2015-08-23 04:16:02 +02:00
45c558563a
avformat: Move MAX_PROBE_PACKETS to internal.h
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2015-08-12 17:33:47 +02:00
28efeb6502
doc: avoid incorrect phrase 'allows to'
...
Also fix typo found by Lou Logan:
Sacrifying -> Sacrificing
Reviewed-by: Lou Logan <lou@lrcd.com >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2015-06-16 21:48:51 +02:00
a228f7d5e5
avformat/avformat: slightly more verbose documentation for open_cb()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-05-11 22:33:48 +02:00
541d75f9a0
avformat: add callback for opening further files
...
Previous version reviewed-by: wm4 <nfxjfg@googlemail.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-05-11 21:55:18 +02:00
748d4816d9
avformat: add AVFMT_FLAG_FASTSEEK, use it for mp3
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-04-22 22:27:05 +02:00
7dd8bf53bd
avformat: add common mechanism for skipping samples at the start of file
...
This makes using the generic indexing code with mp3 easier at a later
point.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-04-22 14:05:46 +02:00
e623e8cbb0
lavf: add documentation on directory listing API
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-04-18 17:54:04 +02:00
7c2e35d1d0
avformat/avformat: improve the text about headerless formats in avformat_flush()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-03-05 00:09:26 +01:00
cca44764b9
avformat: add avformat_flush()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-03-05 00:09:26 +01:00
563ed912ea
Merge commit 'bb7701684c7170dfd5f33a3c7d827265844619f2'
...
* commit 'bb7701684c7170dfd5f33a3c7d827265844619f2':
lavf: Document the codec context initialization
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2015-02-17 21:26:04 +01:00
bb7701684c
lavf: Document the codec context initialization
...
During remuxing avcodec_copy_context() is discouraged as certain fields
(such as codec_tag) could reflect invalid values between input and
output contextes.
2015-02-17 11:27:42 -05:00
2924514721
Merge commit '9deaec782810d098bca11c9332fab2d2f4c5fb78'
...
* commit '9deaec782810d098bca11c9332fab2d2f4c5fb78':
lavf: move internal fields from public to internal context
Conflicts:
libavformat/avformat.h
libavformat/internal.h
libavformat/mux.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2015-02-11 02:47:54 +01:00
9deaec7828
lavf: move internal fields from public to internal context
...
This is not an API change; the fields were explicitly declared private
before.
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2015-02-10 21:45:04 +01:00
a47c9331ef
avformat: Improve data streams/codec support
...
This adds data codec/stream handling where previously there was only
audio/video/subtitles
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-01-16 02:24:08 +01:00
dd4de4a987
Merge commit 'c4aa0f865fb2c3b28a309d1bb27fd1c24b75ba28'
...
* commit 'c4aa0f865fb2c3b28a309d1bb27fd1c24b75ba28':
libavformat: Remove a misleading/incorrect comment
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2015-01-05 02:27:00 +01:00
c4aa0f865f
libavformat: Remove a misleading/incorrect comment
...
This comment can be traced back to the initial commit from 2001,
and it seemed to be misleading/incorect already back then. (It
was used for normal, non-raw file formats already then.)
Signed-off-by: Martin Storsjö <martin@martin.st >
2015-01-04 20:04:33 +02:00
b28652599d
doc: fix spelling errors
...
succesfully => successfully, reproducable => reproducible, specifiying => specifying, isnt => isn't, seperated => separated
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-12-01 00:31:06 +01:00
367c9d33d6
avformat: replace some odd 30-60 rates by higher less odd ones in get_std_framerate()
...
Fixes Ticket4012
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-11-21 13:56:13 +01:00
92c07acce7
Read (display) aspect ratio from mxf files.
...
Fixes ticket #4107 .
2014-11-17 17:54:32 +01:00
6690d4c3f5
lavf/ffm: store/restore private codec context
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com >
2014-11-16 01:13:38 +01:00
66e49ff3b9
Merge commit '1384df641994bf3d6cb51084290aa94752737bae'
...
* commit '1384df641994bf3d6cb51084290aa94752737bae':
lavf: Add an option for avoiding negative timestamps
Conflicts:
libavformat/avformat.h
libavformat/mux.c
libavformat/options_table.h
libavformat/version.h
See: 3ba0dab76aa89c012531michaelni@gmx.at >
2014-11-07 23:09:30 +01:00
1384df6419
lavf: Add an option for avoiding negative timestamps
...
This is the same logic as is invoked on AVFMT_TS_NEGATIVE,
but which can be enabled manually, or can be enabled
in muxers which only need it in certain conditions.
Also allow using the same mechanism to force streams to start
at 0.
Signed-off-by: Martin Storsjö <martin@martin.st >
2014-11-07 12:11:35 +02:00
057ea2a982
avformat: Add format_whitelist
...
This allows restricting demuxers to a list of needed ones for improved security
Note, some demuxers themselfs open other demuxers, these are only restricted if
AVOptions are forwarded to them. Please check that your code does that.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-10-19 04:37:30 +02:00
cf7b90dea2
fix seperator typo
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-10-09 04:19:13 +02:00
Derek Buitenhuis