James Almer
350f4be12d
lavf: remove nonexistent functions from the version file
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 13:35:35 +02:00
James Almer
0ab00a75e4
avcodec/raw: add avpriv_get_raw_pix_fmt_tags()
...
Used to expose ff_raw_pix_fmt_tags[] to other libav* libraries
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 12:52:38 +02:00
Michael Niedermayer
4c404611da
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
Do not return a probe score from set_codec_from_probe_data() if the codec was ignored.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 12:17:35 +02:00
Carl Eugen Hoyos
7c73d21523
lavf/mpegts: Do not return the result of a (void) function from a void function.
...
Fixes compilation with Sun C 5.10.
2014-08-07 09:55:40 +02:00
Carl Eugen Hoyos
ef17a0c7ba
Do not return a probe score from set_codec_from_probe_data() if the codec was ignored.
...
This is a workaround for the issue that stream probing can use
the score of another codec type for mpeg stream autodetection.
Fixes ticket #3821 .
2014-08-07 09:12:34 +02:00
James Almer
5b12b4fc4b
lavf/mpegts: rename ff_mpegts_parse_*() to avpriv_mpegts_parse_*()
...
The were wrongly being exported and used by libavdevice
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 04:28:11 +02:00
Michael Niedermayer
1c59419419
Merge commit 'b50173a4dd47b9c3c89845b781fa958ccf860929'
...
* commit 'b50173a4dd47b9c3c89845b781fa958ccf860929':
movenc: fix QT chapter track character encoding
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 02:54:23 +02:00
Michael Niedermayer
403367d5a9
Merge commit 'da9cc22d5bd5f59756c2037b02966376da2cf323'
...
* commit 'da9cc22d5bd5f59756c2037b02966376da2cf323':
movenc: add track title to tracks
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 02:42:15 +02:00
Michael Niedermayer
71f33051e5
Merge commit 'd9432789bd119f0e37bcf65cebda05d36aafd4ed'
...
* commit 'd9432789bd119f0e37bcf65cebda05d36aafd4ed':
movenc: remove pointless loop around BITEXACT test
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 02:35:39 +02:00
Michael Niedermayer
6a44699746
avformat/dtsdec: check more of the dca headers in dts_probe()
...
Fixes misdetection of 664461_flac_16_44100_2.wav
Fixes Ticket3830
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-06 22:28:46 +02:00
John Stebbins
b50173a4dd
movenc: fix QT chapter track character encoding
...
An encoding ("encd") box is required to tell QT that the string is UTF8
2014-08-06 13:27:17 -07:00
John Stebbins
da9cc22d5b
movenc: add track title to tracks
2014-08-06 13:27:17 -07:00
John Stebbins
d9432789bd
movenc: remove pointless loop around BITEXACT test
2014-08-06 13:27:17 -07:00
Michael Niedermayer
592a854f8c
avformat/iff: Fix "source comment"
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-05 18:16:46 +02:00
Michael Niedermayer
a53a107a2f
Merge commit '0897d2fdc7755849c3ae58d8b543ef734c200d3c'
...
* commit '0897d2fdc7755849c3ae58d8b543ef734c200d3c':
movenc: Add option to disable nero chapters
Conflicts:
doc/muxers.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-05 13:58:10 +02:00
Michael Niedermayer
2e2e6b1be5
Merge commit '2601a9447efb778930b01ac58d2cc1d02498db4e'
...
* commit '2601a9447efb778930b01ac58d2cc1d02498db4e':
mpegts: Add HEVC definitions
Conflicts:
libavformat/mpegts.h
See: b2880a3de9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-05 13:52:32 +02:00
Michael Niedermayer
94d4f9d405
Merge commit '89616408e38ac7257e36976723df0e23d6ee1157'
...
* commit '89616408e38ac7257e36976723df0e23d6ee1157':
mpegts: Define the section length with a constant
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-05 13:45:26 +02:00
John Stebbins
0897d2fdc7
movenc: Add option to disable nero chapters
...
And add flag to muxer documentation.
Nero chapters break some taggers (mp3tag and iTunes).
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-08-05 11:36:08 +02:00
Femi Adeyemi-Ejeye
2601a9447e
mpegts: Add HEVC definitions
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-08-05 11:30:50 +02:00
Luca Barbato
89616408e3
mpegts: Define the section length with a constant
...
The specification says the value is expressed in 10 bits including
the 4-byte CRC.
2014-08-04 22:22:54 +02:00
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
Diego Biurrun
7215fcf840
avformat: Mark AVOutputFormat argument in avformat_query_codec as const
2014-07-26 14:51:16 -07:00
Diego Biurrun
ec4f04da1a
avformat: Mark argument in av_{i|o}format_next/ffurl_protocol_next as const
2014-07-26 14:51:16 -07:00
Michael Niedermayer
a06fac353c
avformat/mux: ignore delayed vp8/9 packets in max_interleave_delta calculation
...
libvpx adds very significant delay, which appears normal and we must
buffer all other streams no matter what to interleave them correctly
Fixes Ticket3440
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-26 01:11:00 +02:00
Nicolas George
04bc370072
lavf/avio: do not include bprint.h.
...
C++ chokes on the definition of AVBPrint.
Including avio.h from c++ code used to work.
Fix trac ticket #3800 .
Signed-off-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-25 05:37:45 +02:00
Michael Niedermayer
66ae994c54
avformat/segment: re-interleave packets if needed
...
Fixes part of Ticket 3797
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-24 23:22:33 +02:00
Michael Niedermayer
351b22caae
avformat/mux: support re-interleaving packets in ff_write_chained()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-24 22:39:22 +02:00
Michael Niedermayer
383a04a127
avformat/mux: keep AVPacket fields consistent in ff_write_chained()
...
This might have caused double frees in theory, i do not have a test case
though
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-24 22:33:21 +02:00
Michael Niedermayer
d44b8f0a47
avformat/matroskaenc: print a warning when the relative timestamp wouldnt fit in 16bit
...
This is somewhat unusual so its better to use warning level than debug
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-24 20:25:29 +02:00
Michael Niedermayer
7923aa0fba
avformat/matroskaenc: Start new cluster if relative timestamp could not otherwise be stored
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-24 18:19:50 +02:00
Michael Niedermayer
3c6e220a8c
avformat/matroskaenc: Factor mkv_start_new_cluster() out
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-24 18:19:11 +02:00
Carl Eugen Hoyos
ef21b3d38e
Ignore xing number of frames if the file is larger than indicated.
...
Fixes ticket #3777 .
2014-07-24 15:34:36 +02:00
Michael Niedermayer
8b59ab1af0
Merge commit 'ce2e858f5b3416c2d54f7f8c14e901f75c48b785'
...
* commit 'ce2e858f5b3416c2d54f7f8c14e901f75c48b785':
http: K&R formatting cosmetics
Conflicts:
libavformat/http.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-24 02:08:14 +02:00
Diego Biurrun
ce2e858f5b
http: K&R formatting cosmetics
...
Also comment some #endifs and reshuffle headers into canonical order.
2014-07-23 13:57:24 -07:00
Andrey Utkin
8a4c0866dc
avio: Introduce avio_read_to_bprint(avioctx, bp, max_size)
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-23 18:42:41 +02:00
Michael Niedermayer
01b236b704
avformat/flvdec: use AV_PKT_DATA_NEW_EXTRADATA for h264 too
...
Fixes Ticket 3787
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-23 17:41:12 +02:00
Michael Niedermayer
016cca4504
Merge commit '7bdd2ff6825951f7a6a6008303acfce7c2a63532'
...
* commit '7bdd2ff6825951f7a6a6008303acfce7c2a63532':
http: Use a constant for the supported header size
Conflicts:
libavformat/http.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-22 22:02:48 +02:00
Carl Eugen Hoyos
050d79b6dd
Autodetect big-endian tiff files.
2014-07-22 18:09:14 +02:00
Luca Barbato
7bdd2ff682
http: Use a constant for the supported header size
2014-07-22 16:38:26 +02:00
Stefano Sabatini
44071b0d25
lavf/segment: sanitize segment end time in case last packet do not have a defined duration
...
In particular, avoids to set segments with duration set to 0
(e.g. segment with a single reference frame for which duration is
undefined).
2014-07-22 13:53:31 +02:00
Stefano Sabatini
713157484a
lavf/segment: do not allow to create segments with no key-frames
...
Fix trac ticket #3749 .
2014-07-22 13:43:06 +02:00
Andreas Cadhalpun
135ea609ce
libavformat/img2dec.c: Add a long_name to the piped image demuxers
...
This fixes segfaults in gst-libav1.0 compiled against FFmpeg 2.3.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-22 05:14:44 +02:00
Michael Niedermayer
ab7c67905d
Merge commit '389380c27915b0505fed538cd54c035c891fabd9'
...
* commit '389380c27915b0505fed538cd54c035c891fabd9':
http: Do move the class instantiation in the conditional block
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-22 03:00:06 +02:00
Michael Niedermayer
e621e6cac6
Merge commit '28df1d24112c6ad0763985df2faeeb198cfbad69'
...
* commit '28df1d24112c6ad0763985df2faeeb198cfbad69':
http: Provide an option to override the HTTP method
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-22 02:51:35 +02:00
Michael Niedermayer
c7168d1a22
Merge commit 'fc27e7272e6f1a7053812f8a15b1b7098de44c71'
...
* commit 'fc27e7272e6f1a7053812f8a15b1b7098de44c71':
mpegts: do not export empty language tags
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-22 02:34:12 +02:00
Dale Curtis
70f7006eb3
avformat/mov: Pass through iTunSMPB from MOV.
...
Allows demuxing of iTunes files into adts while preserving gapless
metadata.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-22 02:11:48 +02:00
Dale Curtis
42f3bc4072
avformat/adtsenc: Optionally enable ID3 in ADTS.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-22 02:11:25 +02:00
Luca Barbato
389380c279
http: Do move the class instantiation in the conditional block
...
Remove a warning if https support is disabled.
2014-07-21 22:18:35 +02:00
Luca Barbato
28df1d2411
http: Provide an option to override the HTTP method
...
Certain servers accept only PUT as valid method.
2014-07-21 22:18:35 +02:00
Jan Gerber
fc27e7272e
mpegts: do not export empty language tags
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-07-21 19:39:31 +00:00
Michael Niedermayer
71e515c180
avformat/sapenc: Use av_mallocz_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-21 03:19:12 +02:00