f9d7431272
avformat/AVFormatContext: Move fields down to match the fork
...
avconv uses private and internal fields from libavformat, we thus must
match the layout even of the fields marked non public.
Otherwise ffmpegs libavformat could not be used as a dropin replacement
on debian/ubuntu
The current soname of libavformat was not part of any release nor are any
fields marked public moved thus in theory
no installed shared lib ABI breakage should occur. Still the need for this
change is unfortunate and chilling.
If you installed shared libs from a recent development version of libavformat
that is more recent than the last release. You probably want to check or rebuild
applications that linked to it.
minor versions of avformat & avdevice are bumped to allow detecting this
as both use the updated struct
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-09 19:06:32 +02:00
bc35df29c1
lavf: add AV_DISPOSITION flags for WebVTT text track kinds
...
There are 4 separate WebVTT text track kinds: subtitles (the default
if not otherwise specified), captions, descriptions, and metadata.
The WebM muxer needs to know which WebVTT text track kind this is, in
order to synthesize the correct track type and codec id.
To allow a demuxer to indicate the text track kind of the input, a new
set of AV_DISPOSITION flag values has been added, corresponding to
each of the non-default text track kind values.
2013-06-25 00:13:47 +02:00
f083b4c338
Merge commit 'e0f8be6413b6a8d334d6052e610af32935c310af'
...
* commit 'e0f8be6413b6a8d334d6052e610af32935c310af':
avformat: Add AVPROBE_SCORE_EXTENSION define and use where appropriate
Conflicts:
libavformat/ac3dec.c
libavformat/avformat.h
libavformat/avs.c
libavformat/m4vdec.c
libavformat/mov.c
libavformat/mp3dec.c
libavformat/mpeg.c
libavformat/mpegvideodec.c
libavformat/psxstr.c
libavformat/pva.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05 12:31:03 +02:00
e0f8be6413
avformat: Add AVPROBE_SCORE_EXTENSION define and use where appropriate
2013-05-04 21:43:06 +02:00
3fc66dfef2
lavf: filter out AVSEEK_FLAG_BACKWARD in new API.
...
Also document that it has no effect.
2013-05-04 14:11:53 +02:00
0104570fb6
Merge commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7'
...
* commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7':
silly typo fixes
Conflicts:
doc/protocols.texi
libavcodec/aacpsy.c
libavformat/utils.c
tools/patcheck
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-04 10:17:52 +02:00
a5f8873620
silly typo fixes
2013-05-03 18:26:12 +02:00
eba33396f0
avformat/mux: set avoid_negative_ts based on flags if not overridden by user or muxer
...
This changes the default to avoid negative timestamps.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-26 14:51:47 +02:00
c4bf740225
Merge commit 'c2cb01d418dd18e1cf997c038d37378d773121be'
...
* commit 'c2cb01d418dd18e1cf997c038d37378d773121be':
lavf: introduce AVFMT_TS_NEGATIVE
Conflicts:
libavformat/avformat.h
libavformat/mux.c
tests/ref/lavf/asf
tests/ref/lavf/mkv
tests/ref/lavf/mpg
tests/ref/lavf/ts
tests/ref/seek/lavf-asf
tests/ref/seek/lavf-mkv
tests/ref/seek/lavf-mpg
tests/ref/seek/lavf-ts
This commit does not change the default ts behaviour, such
change will, if its done, be done separately.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-26 10:59:45 +02:00
c2cb01d418
lavf: introduce AVFMT_TS_NEGATIVE
...
Most formats do not support negative timestamps, shift them to avoid
unexpected behaviour and a number of bad crashes.
CC:libav-stable@libav.org
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-04-25 10:13:27 +02:00
e10f5bd05c
avformat: Add a mechanism to allow demuxers to detect byte based seeking.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-04 04:04:24 +02:00
ef7b6b489a
ffmpeg/avformat: factor av_guess_frame_rate() out
...
This will be used in ffplay
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-29 17:40:28 +01:00
4f112a8e34
lavf/mux: add the flush_packets option.
...
Note: a lot of muxers already do the flushing explicitly.
2013-03-24 23:19:07 +01:00
608bccf470
lavf/avformat.h: fix a few typos in AVFormatContext:avoid_negative_ts doxy
2013-03-19 17:31:16 +01:00
06a8350599
Merge commit '7b486ab13bfcfa88a7cd92586de50e49966ec292'
...
* commit '7b486ab13bfcfa88a7cd92586de50e49966ec292':
lavf: remove disabled FF_API_AV_GETTIME cruft
lavf: remove disabled FF_API_INTERLEAVE_PACKET cruft
Conflicts:
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13 12:37:03 +01:00
c292e340ed
avformat: keep r_frame_rate
...
This field is used and nothing equivalent exists
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12 15:28:23 +01:00
85a5bc054c
lavf: remove disabled FF_API_R_FRAME_RATE cruft
2013-03-11 18:23:50 +01:00
7b486ab13b
lavf: remove disabled FF_API_AV_GETTIME cruft
2013-03-11 18:23:18 +01:00
32e5194969
lavf: remove disabled FF_API_INTERLEAVE_PACKET cruft
2013-03-11 18:23:10 +01:00
435c2a31ad
lavf: remove disabled FF_API_READ_PACKET cruft
2013-03-11 18:23:02 +01:00
0a7c4daf46
lavf: remove disabled FF_API_CLOSE_INPUT_FILE cruft
2013-03-11 18:22:45 +01:00
2653e12520
Merge commit '1afddbe59e96af75f1c07605afc95615569f388f'
...
* commit '1afddbe59e96af75f1c07605afc95615569f388f':
avpacket: use AVBuffer to allow refcounting the packets.
Conflicts:
libavcodec/avpacket.c
libavcodec/utils.c
libavdevice/v4l2.c
libavformat/avidec.c
libavformat/flacdec.c
libavformat/id3v2.c
libavformat/matroskaenc.c
libavformat/mux.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-08 19:12:03 +01:00
1afddbe59e
avpacket: use AVBuffer to allow refcounting the packets.
...
This will allow us to avoid copying the packets in many cases.
This breaks ABI.
2013-03-08 07:33:45 +01:00
faa0068a87
avformat: Make duration estimation from pts more robust
...
Ignore durations which differ significantly from the previous
Fixes Ticket2018
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-04 18:01:32 +01:00
82d79289db
avformat: Allocate duration_error separately
...
This significantly reduces the memory needed per AVStream when the
array is not needed.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-23 23:15:09 +01:00
d5ce725cb3
Fix a few "its" vs "it's" typo.
2013-02-14 23:45:48 +01:00
a8e748eee5
lavf: add seek2any to allow forcing seeking to non keyframes via AVOptions
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-07 21:54:41 +01:00
a1a707f728
Add a new function av_codec_get_tag2().
...
av_codec_get_tag() may return 0 both in case a codec_tag was
found and if no codec_tag was found.
The new function does not have this ambiguity.
2013-01-17 20:44:33 +01:00
511cf612ac
miscellaneous typo fixes
2012-12-21 00:18:34 +01:00
2d74dea84f
lavf: Provide a monotonic timestamp to the outside world
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-15 21:28:45 +01:00
a3bb59b163
av_register_protocol is gone :(
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-12-04 17:01:27 +00:00
bdba96e93c
use correct doxygen parameter direction syntax
...
Signed-off-by: Peter Ross <pross@xvid.org>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-21 23:56:15 +01:00
d513fb1c75
Add -skip_initial_bytes option.
...
Fixes ticket #1909 .
2012-11-20 22:04:14 +01:00
a9b1536a01
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
bgmc: Fix av_malloc checks in ff_bgmc_init()
rtp: set the payload type as stream id
Conflicts:
libavformat/rtpenc_chain.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-15 11:31:13 +01:00
4d941eac16
Merge commit '3b4296f41473a5b39e84d7a49d480624c9c60040'
...
* commit '3b4296f41473a5b39e84d7a49d480624c9c60040':
avformat: clarify stream id for muxing
fate: Add dependencies for aac, alac, amrnb, amrwb, atrac tests
ppc: do not pass redundant compiler flags
avutil: change GET_UTF8 to not use av_log2()
segment: fix NULL pointer dereference in seg_write_header()
Conflicts:
tests/fate/aac.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-15 11:12:25 +01:00
3b4296f414
avformat: clarify stream id for muxing
2012-11-14 20:38:51 +01:00
8034130e06
rtp: set the payload type as stream id
...
Support multiple video/audio streams with different format in the
same session.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2012-11-14 20:38:51 +01:00
37e81996dc
Merge commit '9221efef7968463f3e3d9ce79ea72eaca082e73f'
...
* commit '9221efef7968463f3e3d9ce79ea72eaca082e73f':
lavf: fix av_interleaved_write_frame() doxy.
lavf: clarify the lifetime of demuxed packets.
avconv: do not free muxed packet on streamcopy.
crc: move doxy to the header
vf_drawtext: do not use deprecated av_tree_node_size
x86: Refactor PSWAPD fallback implementations and port to cpuflags
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-03 14:24:11 +01:00
9221efef79
lavf: fix av_interleaved_write_frame() doxy.
...
A sentence was mistakenly inserted in the middle of another sentence.
2012-11-02 18:28:56 +01:00
717a450993
lavf: clarify the lifetime of demuxed packets.
2012-11-02 18:28:56 +01:00
e12cfd044c
lavf: const correctness for avformat_new_stream
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-10-24 17:55:35 +00:00
5442c6cce3
lavf: fix duration estimation for multi program TS
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-23 18:11:26 +02:00
93f244e3ab
Merge commit '0af1fe845a9d7112da0a58d33a4fc81fe7c47e95'
...
* commit '0af1fe845a9d7112da0a58d33a4fc81fe7c47e95':
avformat: Fix references to the removed function av_write_header in comments
changelog: Mention the MSVC DLL support
fate: add dependencies for misc microsoft codecs
fate-twinvq: add dependencies
fate-mpc: add dependencies
fate-indeo: add dependencies
fate-als: add dependencies
fate: dependencies for demux tests
Conflicts:
Changelog
tests/Makefile
tests/fate/demux.mak
tests/fate/microsoft.mak
tests/fate/mpc.mak
tests/fate/vqf.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-19 13:47:47 +02:00
0af1fe845a
avformat: Fix references to the removed function av_write_header in comments
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-10-18 16:33:48 +03:00
45bd0d15f4
lavf: fix fps detection with PAFF H.264
...
Fixes Ticket1065
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-14 19:20:23 +02:00
94f5470a20
lavf: add a AVPROBE_SCORE_RETRY instead of using hardcoded values.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-10 21:39:19 +02:00
27a341518e
avformat: fix typo in comment
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-10-07 17:57:13 +00:00
82db8ee321
Merge commit 'fd41cb43702498948ff14ba8c284fd5c15fc729d'
...
* commit 'fd41cb43702498948ff14ba8c284fd5c15fc729d':
avconv: improve sample format negotiation for decoder request
Opus encoder using libopus
mpegts: Drop pointless casting of hex_dump_debug arguments
avformat: const correctness for av_hex_dump / av_hex_dump_log
wmadec: Adjust debug printf argument length modifier
Conflicts:
Changelog
ffmpeg.c
libavcodec/libopusdec.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-02 14:58:19 +02:00
d3c40a7d1d
avformat: const correctness for av_hex_dump / av_hex_dump_log
2012-10-01 13:18:28 +02:00
279ae1cd72
lavf: move fields that appear to be intended as public API to the correct section
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-27 18:19:01 +02:00
Michael Niedermayer
Matthew Heaney
Diego Biurrun
Nicolas George
Luca Barbato
Stefano Sabatini
Anton Khirnov
Clément Bœsch
Carl Eugen Hoyos
Harald Axmann
Paul B Mahol
Peter Ross
Martin Storsjö