Michael Niedermayer
4e855c11b5
avformat/util: change av_find_default_stream_index() to use a score based system
...
Disfavor video streams with unknown resolution and no packets
Fixes seeking in audio-only-speex.flv
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-04 18:06:26 +02:00
Michael Niedermayer
491c52d3b0
Merge commit 'eb9244f20210fd420fb9b3c98126f9cae525d1cc'
...
* commit 'eb9244f20210fd420fb9b3c98126f9cae525d1cc':
Add Icecast protocol
Conflicts:
Changelog
configure
doc/protocols.texi
libavformat/icecast.c
libavformat/version.h
See: e3dc2c86fc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-04 14:14:13 +02:00
ePirat
e3dc2c86fc
libavformat: Add Icecast protocol
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-04 13:33:44 +02:00
Marvin Scholz
eb9244f202
Add Icecast protocol
...
Icecast is basically a convenience wrapper around the HTTP protocol.
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-08-04 12:56:42 +03:00
Michael Niedermayer
b4d4f8f826
Merge commit '6a463e7fb4f028c52d2e2d054f9483f4fff492bc'
...
* commit '6a463e7fb4f028c52d2e2d054f9483f4fff492bc':
http: Refactor http_open_cnx
See: c2a170ac0d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-04 03:44:11 +02:00
Rodger Combs
c2a170ac0d
avformat/http: fix tls/tcp protocol after a 302 move in https
...
Fixes ticket 3824
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-04 03:33:40 +02:00
Luca Barbato
6a463e7fb4
http: Refactor http_open_cnx
...
Split return value handling from the actual opening.
Incidentally fixes the https -> http redirect issue reported by
Compn on behalf of rcombs.
CC: libav-stable@libav.org
2014-08-03 23:13:27 +02:00
Michael Niedermayer
6cdf409884
avformat/mpegtsenc: do not flush after everything
...
there is flushing code in the avformat core that does this in a more
controlled way.
Fixes ticket2748
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-03 18:10:04 +02:00
Michael Niedermayer
fee982048e
avformat/mux: flush after header writing, like after packets
...
This makes problematic unconditional flushes in mpegts redundant
And is thus part of a fix for ticket 2748
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-03 18:10:04 +02:00
Michael Niedermayer
2e6fdcb7f3
avformat/tee: flip assigment direction
...
Found-by: CSA
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-03 03:18:52 +02:00
Michael Niedermayer
2b501b553f
avformat/dtsdec: skip the first 4k in dts_probe()
...
DTS primarly needs to be separated from PCM, and PCM can contain cliping and
overshoots at the very start which can mimic DTS headers.
If this isnt sufficient then more of the DTS stream has to be decoded
and analyzed
Fixes ticket3784
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-02 17:25:04 +02:00
Michael Niedermayer
e6fabd6e9b
avformat/dtsdec: fix signedness in reference pcm highpass in dts_probe()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-02 17:24:42 +02:00
Michael Niedermayer
dd551dc7ff
avformat/dtsdec: count LE and BE separately in dts_probe()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-02 17:21:03 +02:00
Michael Niedermayer
98e42a249e
avformat/format: Check for av_guess_format() failure
...
Fixes null pointer dereference
Fixes Ticket3812
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-02 04:16:02 +02:00
Michael Niedermayer
26ffa8eaee
avformat/format: use av_match_name() in av_guess_codec()
...
Fixes part of Ticket2236
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-02 03:39:38 +02:00
Michael Niedermayer
afd62b3f18
Merge commit 'fa14804c83a7108a50c63d1f2180e30c75909529'
...
* commit 'fa14804c83a7108a50c63d1f2180e30c75909529':
flv: Index the audio stream
Conflicts:
libavformat/flvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-01 21:34:31 +02:00
Luca Barbato
fa14804c83
flv: Index the audio stream
...
And leverage the video index if the video is just disabled as wm4
did in an initial patch.
2014-08-01 15:04:51 +02:00
Nicolas Martyanoff
467e9d6186
avformat/hlsenc: add some empty lines to make the code easier to read
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-31 00:33:49 +02:00
Nicolas Martyanoff
706fcffce1
avformat/hlsenc: rename some identifers to make the code easier to read
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-31 00:31:49 +02:00
Nicolas Martyanoff
53f10e0368
avformat/hlsenc: Add some comments to make the code easier to read
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-31 00:04:05 +02:00
Reimar Döffinger
1c84aad718
movdec: remove nonsensical snprintf.
...
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2014-07-30 20:25:29 +02:00
Reimar Döffinger
04aec74f45
mxfdec: add missing "const" to array declaration.
...
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2014-07-30 20:25:29 +02:00
Carl Eugen Hoyos
ff9a154157
Add int64_t probesize2 instead of int probesize to AVFormatContext.
...
Allows to set a probesize >2G.
Tested-by: Oliver Fromme
2014-07-30 11:09:25 +02:00
Carl Eugen Hoyos
355121bcb5
lavf/mux: Fix a typo checking aspect ratios.
...
Fixes ticket #3813 .
2014-07-30 11:03:29 +02:00
gerion.entrup@t-online.de
f2855eb4d7
avformat/movenc: add m4b to list of ipod playable files
...
m4b is the extension used by iDevices to detect audiobooks.
2014-07-30 04:19:58 +02:00
Michael Niedermayer
d38edeee9b
avformat/format: fix memleak and error code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-29 21:38:15 +02:00
Michael Niedermayer
4182728c78
avformat/format.c: remove duplicate include, put libavutil includes together
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-29 21:35:07 +02:00
Michael Niedermayer
6d69503883
avformat/format: simplify ifdeffery
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-29 21:33:10 +02:00
Michael Niedermayer
92de445034
Merge commit 'fa38573cd9ce4ab727f86f57c03b113cfd4c9d0a'
...
* commit 'fa38573cd9ce4ab727f86f57c03b113cfd4c9d0a':
matroska: Register mime types
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-29 21:18:11 +02:00
Michael Niedermayer
8cad746093
Merge commit '02cf0c9e42967de1e4d2803bee3573bc5b735fdd'
...
* commit '02cf0c9e42967de1e4d2803bee3573bc5b735fdd':
aac: Register the mime type
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-29 21:12:07 +02:00
Michael Niedermayer
9694695a21
avformat: fix probe mime version checks
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-29 21:02:48 +02:00
Michael Niedermayer
80a3a6611f
Merge commit '3a19405d574a467c68b48e4b824c76617fd59de0'
...
* commit '3a19405d574a467c68b48e4b824c76617fd59de0':
avformat: Use the mime type information in input probe
Conflicts:
libavformat/format.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-29 20:57:42 +02:00
Michael Niedermayer
31e0b5d3cb
Merge commit '69e7336b8e16ee65226fc20381baf537f4b125e6'
...
* commit '69e7336b8e16ee65226fc20381baf537f4b125e6':
avstring: Expose the simple name match function
Conflicts:
libavutil/avstring.c
libavutil/avstring.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-29 20:24:42 +02:00
Michael Niedermayer
e066f01539
Merge commit 'e253a9e2b3d683eb51db7c776326eb07de10ad4c'
...
* commit 'e253a9e2b3d683eb51db7c776326eb07de10ad4c':
avformat: Move av_probe_input* to format.c
Conflicts:
libavformat/format.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-29 20:02:09 +02:00
Luca Barbato
fa38573cd9
matroska: Register mime types
2014-07-29 17:47:32 +02:00
Luca Barbato
02cf0c9e42
aac: Register the mime type
...
Speed up probing ADTS live streams that are not frame-aligned such
as http://mp3.streampower.be/radio1.aac .
2014-07-29 17:47:32 +02:00
Luca Barbato
3a19405d57
avformat: Use the mime type information in input probe
...
It should provide a quicker guess for elementary streams provided
by http.
2014-07-29 17:47:26 +02:00
Luca Barbato
69e7336b8e
avstring: Expose the simple name match function
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-07-29 17:46:29 +02:00
Nicolas Martyanoff
0c889da8cb
avformat/hlsenc: fix cleanup after avformat_write_header()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-29 16:24:11 +02:00
Luca Barbato
e253a9e2b3
avformat: Move av_probe_input* to format.c
2014-07-29 15:18:51 +02:00
Michael Niedermayer
60831f441d
Merge commit '59ca29a560ba0cfe97457de8cedf77db434f0de4'
...
* commit '59ca29a560ba0cfe97457de8cedf77db434f0de4':
dump: Use correct printf conversion specifiers for POSIX int types
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-29 00:41:00 +02:00
Michael Niedermayer
8b1e920676
Merge commit '259fe7280d0b63dc7a8ff017d44f26d3a84cfde8'
...
* commit '259fe7280d0b63dc7a8ff017d44f26d3a84cfde8':
mxf: Extract origin information from material and source track
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-29 00:18:03 +02:00
Michael Niedermayer
4a4d0258ee
Merge commit 'c9d982aa11a6267611c3770792f0e04b48438348'
...
* commit 'c9d982aa11a6267611c3770792f0e04b48438348':
mxf: Detect Vanc/Vbi SMPTE-436M mxf track
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-29 00:12:03 +02:00
Carl Eugen Hoyos
63c0b41904
Fix standalone compilation of the adts muxer.
2014-07-28 23:25:54 +02:00
Diego Biurrun
942269fd00
caf: Use correct printf conversion specifiers for POSIX int types
2014-07-28 13:19:05 -07:00
Diego Biurrun
59ca29a560
dump: Use correct printf conversion specifiers for POSIX int types
2014-07-28 13:19:04 -07:00
Marc-Antoine Arnaud
259fe7280d
mxf: Extract origin information from material and source track
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-07-28 22:17:42 +02:00
Marc-Antoine Arnaud
c9d982aa11
mxf: Detect Vanc/Vbi SMPTE-436M mxf track
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-07-28 22:17:42 +02:00
Michael Niedermayer
57e7d9d929
Merge commit '7215fcf84032118ecd9fb54fb14154d69fea638d'
...
* commit '7215fcf84032118ecd9fb54fb14154d69fea638d':
avformat: Mark AVOutputFormat argument in avformat_query_codec as const
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-27 02:16:09 +02:00
Michael Niedermayer
6542e5575f
Merge commit 'ec4f04da1a3462dac429b9d15dee5f027309da15'
...
* commit 'ec4f04da1a3462dac429b9d15dee5f027309da15':
avformat: Mark argument in av_{i|o}format_next/ffurl_protocol_next as const
Conflicts:
libavformat/format.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-27 02:09:41 +02:00