Diego Biurrun
3cbe112653
dv: Split DV data table declarations into their own header
...
This is necessary to avoid target config settings bleeding into the host
compilation process with hardcoded tables and the DV VLC tables no longer
present as static tables in a header file.
2013-11-15 01:29:47 +01:00
Michael Niedermayer
074bae745d
Merge commit 'ecf442a58b09bdb1dc1d2c3904b82ac5f79b2878'
...
* commit 'ecf442a58b09bdb1dc1d2c3904b82ac5f79b2878':
lavf: improve support for AVC-Intra files.
Conflicts:
libavformat/internal.h
libavformat/isom.c
libavformat/mxfdec.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-14 21:04:44 +01:00
Reimar Döffinger
ecf442a58b
lavf: improve support for AVC-Intra files.
...
Generate extradata with SPS/PPS based on container dimensions.
Authors of this commit are: Reimar and Thomas Mundt
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-11-14 18:59:39 +01:00
Marton Balint
951d819006
mxfdec: update current edit unit when seeking in mxf files without index tables
...
Fixes audio packet pts values in some files generated by AVID TRMG 3.01.
Signed-off-by: Marton Balint <cus@passwd.hu>
Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-11-14 18:59:17 +01:00
Michael Niedermayer
4abe6e4153
avformat/nullenc: mark null as VFPS
...
This avoids frame duplication for null output
avoiding unneeded computations.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-13 22:56:18 +01:00
Michael Niedermayer
269f5d902a
avformat/aviobuf: return error from avio_put_str16le() for invalid input
...
Found-by: Stefano Sabatini
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-13 19:16:27 +01:00
Michael Niedermayer
b52ae27edf
avio_put_str16le: Print error message in case of invalid UTF8 input
...
Found-by: Stefano Sabatini
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-13 19:09:04 +01:00
Michael Niedermayer
7561974dfe
avformat/mmst: propagate error code from avio_put_str16le()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-13 18:04:11 +01:00
Michael Niedermayer
e3fc4481b6
avformat/vqf: check a few more bits in probe
...
Fixes probetest failure
The threshold is choosen so that a all printale ascii string will never be
detected as vqf
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-13 01:36:09 +01:00
Michael Niedermayer
0062869ae2
avformat/smacker: check width/height in probe
...
Fixes probetest failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-12 19:37:37 +01:00
Michael Niedermayer
f9b89b61f8
avformat/electronicarts: check chunksize more completely in probe()
...
Fixes probetest failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-11 21:31:56 +01:00
Michael Niedermayer
20769d9349
avformat/electronicarts: check chunk size.
...
Fix infinite loop
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-11 19:51:12 +01:00
Michael Niedermayer
bdab2421a5
avformat/dfa: check first frame offset in probe
...
Fixes probetest failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-11 19:38:38 +01:00
Michael Niedermayer
f66f3819b9
avformat/bethsoftvid: check 4th header byte in probe
...
Fixes probetest failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-11 17:50:51 +01:00
Michael Niedermayer
650fd9c004
avformat/avr: check channels and bps in probe
...
Fixes probetest failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-11 14:51:43 +01:00
Michael Niedermayer
676bc505f7
avformat/utils: disabled debug code to collect format probing statistics
...
This allows collecting statistics on probing scores and the amount of data
probing needed for various files and formats.
For example it can be used to find out which formats tend to need more
data for probing or which files are probed with less certain/lower scores
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-11 13:06:36 +01:00
Michael Niedermayer
2fbc759d08
avformat/diracdec: check 2 chunks in probe
...
Fixes probetest failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-10 16:06:16 +01:00
Michael Niedermayer
023953e964
avformat/astdec: increase the score for odd samplerate/channels to max/8
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-10 13:37:06 +01:00
Michael Niedermayer
eb96802355
avformat/rsd: increase the score for odd samplerate/channels to max/8
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-10 13:37:03 +01:00
Michael Niedermayer
ef28694d36
avformat/lvfdec: increase the score for odd channels to max/8
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-10 13:36:59 +01:00
Michael Niedermayer
9225ebd50d
avformat/swfdec: return AVPROBE_SCORE_MAX / 4 for unexpected versions
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-10 13:25:35 +01:00
Michael Niedermayer
b570835296
avformat/ape: check version in probe
...
Fixes probetest failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-10 13:25:35 +01:00
Michael Niedermayer
59ce62f713
avformat/dv: remove unused variable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-10 12:27:17 +01:00
Michael Niedermayer
52268def10
avformat/thp: check fps value during probing
...
Fixes probetest failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-10 02:04:08 +01:00
Michael Niedermayer
858ef56297
avformat/thp: do not set sample_rate for a video codec
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-10 02:04:08 +01:00
Erik Olofsson
f5bffd3a1a
libavf/avienc: store language metadata for XSUB streams
...
Formatted in such a way that DivX certified players can decode it.
Verified on Sony Playstation 3 and Philips DVP3380.
Fixes ticket 2385
Signed-off-by: Erik Olofsson <eaj.olofsson@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-09 20:33:04 +01:00
Michael Niedermayer
ef8f293472
avformat/dv: consider a header match at byte 0 to count as detection of dv in probe
...
This reduces the amount of data needed to identify dv
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-09 18:39:09 +01:00
Michael Niedermayer
e624df5dc3
mpegts: only calculate stat index when its needed during probe
...
40% faster probe
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-09 16:09:26 +01:00
Michael Niedermayer
9825b99eca
avformat/mpegts: do not hardcode type used in memset()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-09 16:03:41 +01:00
Michael Niedermayer
76a47d66c4
avformat/dv: about 3 times faster probe
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-09 14:46:14 +01:00
James Zern
eb7f7b797f
riff: add VP9 fourcc
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-09 12:13:44 +01:00
Michael Niedermayer
64f4816915
avformat/mp3dec: 4x faster probing
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-09 01:45:24 +01:00
Michael Niedermayer
557571ff7d
avformat/h261dec: dont accept invalid gobs in probe as valid
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-09 01:12:10 +01:00
Michael Niedermayer
891f33cc70
avformat/h261dec: optimize probe
...
about 3 times faster
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-09 00:45:35 +01:00
Michael Niedermayer
c79c7ffc9d
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
avienc: drop the vfr flag.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-09 00:18:50 +01:00
Michael Niedermayer
a26e83da6c
avformat/mxfdec: optimize probing
...
about 71 times faster
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-08 22:33:52 +01:00
Anton Khirnov
d42db44cfe
avienc: drop the vfr flag.
...
AVI does not really support vfr properly, only by padding with null
packets.
2013-11-08 21:02:29 +01:00
Michael Niedermayer
4f0e85517f
avformat/icodec: reduce score returned on probing
...
The ico probe function is pretty weak just checking a few bytes for being 0, 1 or not 0
Fixes probetest failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-08 20:10:33 +01:00
Michael Niedermayer
f8a9cf7704
avformat/lvfdec: check stream count during probing
...
Fixes probetest failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-08 17:03:42 +01:00
Michael Niedermayer
4c439f6e39
avformat/idcin: check the decompressed frame size during probing
...
Fixes probetest failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-08 15:19:35 +01:00
Hendrik Leppkes
019247bdc3
avformat/mov: only force parsing for video tracks if stss is empty
...
Fixes playback of some AAC streams, which are otherwise mangled by the
parser, and stss is typically only valid for video anyway.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-08 11:31:02 +01:00
Michael Niedermayer
3836af4765
avformat/mpegvideodec: check seq headers more completely during probing
...
Fixes probetest failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-07 20:39:08 +01:00
Clément Bœsch
3bcd5c1e31
avformat/img2enc: simplify split planes extension selection.
2013-11-07 20:30:43 +01:00
Clément Bœsch
c37b0daf33
avformat/gif: fix final_delay unit in documentation.
2013-11-07 20:30:43 +01:00
Clément Bœsch
3c5e6e7635
avformat/img2enc: reindent after previous commit.
2013-11-07 20:30:43 +01:00
Clément Bœsch
f70db22999
avformat/image2: allow muxing gif files.
...
Fixes Ticket #2936 .
2013-11-07 20:30:43 +01:00
Michael Niedermayer
cbe84b4ffa
avformat/astdec: sanity check channels & sample rate
...
Fixes probetest failure
Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-07 14:58:34 +01:00
kowalsky
4684539c91
avformat/hls: fixed bug where custom http headers weren't kept for hls streams
...
See: https://trac.ffmpeg.org/ticket/3024
2013-11-07 12:29:45 +01:00
Michael Niedermayer
3e6b7bbce5
avformat/segafilm: check 2nd tag
...
Fixes probetest failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-06 12:56:42 +01:00
Michael Niedermayer
ff1d81b08c
avformat/swfdec: check version and size during probing
...
Fixes probetest failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-06 12:44:02 +01:00
Michael Niedermayer
7b7697646b
avformat/rsd: increase probe score, as misdetections are fixed
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-06 11:57:57 +01:00
Michael Niedermayer
50a3c4c5d2
avformat/rsd: Check channels and sample_rate fields
...
Fixes probetest failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-06 11:57:57 +01:00
Michael Niedermayer
a35e30b672
avformat/libgme: decrease score by 1, fixes probetest failure
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-06 11:57:48 +01:00
Michael Niedermayer
04047b6166
avformat/http: print http headers at AV_LOG_DEBUG level
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-05 01:38:08 +01:00
Michael Niedermayer
bd75651378
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
omadec: loosen format probing constraints
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-04 22:46:22 +01:00
Michael Niedermayer
aeaca3816c
Merge commit '1c736bedd9891501960ebac0f7c05eb60225e947'
...
* commit '1c736bedd9891501960ebac0f7c05eb60225e947':
omadec: check GEOB sizes against buffer size
Conflicts:
libavformat/omadec.c
See: e74fa25cb9
See: 91e72e3514
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-04 22:08:59 +01:00
David Goldwich
0a7fef39fc
omadec: loosen format probing constraints
...
Imporoves detection of some files in the wild:
- ID3v2 a.k.a. "ea3" header is optional.
- Version and flags in ID3v2 header are unspecified.
Signed-off-by: David Goldwich <david.goldwich@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-11-04 18:43:18 +01:00
Michael Niedermayer
1c736bedd9
omadec: check GEOB sizes against buffer size
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: David Goldwich <david.goldwich@gmail.com>
CC:libav-stable@libav.org
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-11-04 18:43:03 +01:00
Michael Niedermayer
97f50e92b5
omadec: Fix wrong number of array elements
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: David Goldwich <david.goldwich@gmail.com>
CC:libav-stable@libav.org
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-11-04 18:38:01 +01:00
wm4
3220a894f7
http: add hack to make streams served by MediaGateway not seekable
...
These streams are reported as seekable, but all tests show they are not,
and the server merely pretends the streams are seekable. The server
responds with:
content-range: bytes 0-1999999999/2000000000
Range requests seem to be correctly answered, but the actual data
returned at the same offset is different. Assume this is a bug in the
server software. The server identifies itself as:
Server: MediaGateway 3.5.2-001
Add a hack that checks the server name, and disables seeking in this
case.
Test URL: http://8283.live.streamtheworld.com:80/CBC_R1_VCR_H_SC
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-03 22:57:56 +01:00
Michael Niedermayer
8b73a3f6f6
avformat/utils: never decrease has_b_frames in compute_pkt_fields()
...
The intent of the original check was to increase has_b_frames when
it was incorrectly set to 0. Later codecs allowed larger values
Found-by: divVerent
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-03 21:36:10 +01:00
Michael Niedermayer
2ed562d5fa
Merge remote-tracking branch 'cigaes/master'
...
* cigaes/master:
lavfi/af_pan: support unknown layouts on input.
lavfi/af_pan: support unknown layouts on output.
lswr: fix assert failure on unknown layouts.
lavfi: parsing helper for unknown channel layouts.
lavfi/avfiltergraph: do not reduce incompatible lists.
lavfi/avfiltergraph: suggest a solution when format selection fails.
lavd/lavfi: support unknown channel layouts.
lavf/wavenc: check for a single stream.
lavd/alsa: add stream validation
lavd/alsa: fix timestamp calculation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-03 13:57:05 +01:00
Michael Niedermayer
b6413cdc02
Merge commit 'c0bba95c2363641d3297b3852b2ece1474cda295'
...
* commit 'c0bba95c2363641d3297b3852b2ece1474cda295':
wtv: fix variable sign in format
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-03 12:48:28 +01:00
Vittorio Giovara
d763978583
rtmpproto: Reorder conditions to help dead code elimination
...
This makes sure that these branches are eliminated properly
with clang with optimizations disabled.
2013-11-03 11:51:41 +01:00
Vittorio Giovara
c0bba95c23
wtv: fix variable sign in format
2013-11-03 11:51:40 +01:00
Nicolas George
eeb975f5cd
lavf/wavenc: check for a single stream.
...
Fix trac ticket #3110 .
2013-11-03 10:29:27 +01:00
Michael Niedermayer
67d1d06225
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
os_support: Add #endif comments for better readability
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-02 18:37:21 +01:00
Diego Biurrun
5928b29f53
os_support: Add #endif comments for better readability
2013-11-02 13:57:03 +01:00
Michael Niedermayer
641358addc
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
Add an HDS live fragmenting muxer
Conflicts:
Changelog
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-02 10:38:03 +01:00
Martin Storsjö
435214a757
Add an HDS live fragmenting muxer
...
HDS fragments basically are FLV fragments wrapped in an ISO
media mdat atom.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-11-02 10:51:00 +02:00
Anton Khirnov
d1c229cdbc
lavf: do not use int to store an int64
2013-11-01 21:01:32 +01:00
Mark Himsley
8b3964ecd1
avformat/isom: lpcm in mov default to big endian
...
It is my understanding that "Unless otherwise stated, all data in a
QuickTime movie is stored in big-endian byte ordering" [1] in MOV files.
I have a couple of thousand files, which technically are invalid because
their sound sample description element 4CC is 'lpcm' but its version is
0 - and "Version 0 supports only uncompressed audio in raw ('raw ') or
twos-complement ('twos') format" [2]
Because isom.c only contains a mapping for 4CC 'lpcm' to
AV_CODEC_ID_PCM_S16LE, these files have their audio decoded as LE when
it is actually BE.
This commit adds AV_CODEC_ID_PCM_S16BE as the first match for 4CC 'lpcm'.
[1]
https://developer.apple.com/library/mac/documentation/quicktime/QTFF/qtff.pdf
page 21
[2]
https://developer.apple.com/library/mac/documentation/quicktime/QTFF/qtff.pdf
page 178
Reviewed-by: Yusuke Nakamura <muken.the.vfrmaniac@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01 19:46:02 +01:00
Michael Niedermayer
1295377f0a
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
rtspenc: Make sure BYE packets are sent before TEARDOWN
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01 19:40:20 +01:00
Michael Niedermayer
04894ef32e
Merge commit '9ceed7af377cea6a430d63a2f5d5cf1afe0d4f05'
...
* commit '9ceed7af377cea6a430d63a2f5d5cf1afe0d4f05':
rtpenc: Add a rtpflag option for sending BYE packets when finishing
Conflicts:
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01 19:34:19 +01:00
Michael Niedermayer
5a7a56d7be
Merge commit 'b264453de93999ea6f23e98014390af468f56146'
...
* commit 'b264453de93999ea6f23e98014390af468f56146':
rtpenc: Remove some superfluous parentheses
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01 19:33:16 +01:00
Michael Niedermayer
81c3bb78ac
Merge commit 'd07b51bf0733fe58bbfa13c448775dc325463cb4'
...
* commit 'd07b51bf0733fe58bbfa13c448775dc325463cb4':
aviobuf: Handle a NULL buffer in avio_close_dyn_buf
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01 19:28:39 +01:00
Michael Niedermayer
6262763d8d
Merge commit 'b6a4701612514c97d22f7ffb37993539f7718352'
...
* commit 'b6a4701612514c97d22f7ffb37993539f7718352':
mpegts: Support HEVC demuxing
Conflicts:
Changelog
libavformat/version.h
See: 93c1fe4de3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01 18:05:25 +01:00
Michael Niedermayer
0fbeeb9399
Merge commit '959bea13ce3498a5bddf8a415a061a7bb5a8b075'
...
* commit '959bea13ce3498a5bddf8a415a061a7bb5a8b075':
matroskadec: Support HEVC demuxing
Conflicts:
Changelog
libavformat/matroskadec.c
libavformat/version.h
See: 16b6839de6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01 17:57:57 +01:00
Michael Niedermayer
3a0c902636
Merge commit 'ea29f965dc71182f77b8efe819630f55e48b0ab7'
...
* commit 'ea29f965dc71182f77b8efe819630f55e48b0ab7':
mov: Support HEVC demuxing
Conflicts:
Changelog
libavformat/mov.c
libavformat/version.h
See: 53f903b7c5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01 17:42:10 +01:00
Michael Niedermayer
b594aceb94
Merge commit '5846646296e377e093441dfe9eadde38ff1f7c99'
...
* commit '5846646296e377e093441dfe9eadde38ff1f7c99':
Add raw HEVC demuxer
Conflicts:
Changelog
libavformat/hevcdec.c
libavformat/version.h
See: 902a5fa722
and later commits
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01 17:33:05 +01:00
Michael Niedermayer
51c5768cca
Merge commit 'ce6949d3a0607eb318dc2872553110df934e9720'
...
* commit 'ce6949d3a0607eb318dc2872553110df934e9720':
oggparsetheora: stop using deprecated avcodec_set_dimensions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01 13:15:21 +01:00
Michael Niedermayer
a2bfee36b7
Merge commit '9af7a8523a6bb517834ebed36093bdab11a8b38e'
...
* commit '9af7a8523a6bb517834ebed36093bdab11a8b38e':
HNM4/HNM4A demuxer & video decoder
Conflicts:
Changelog
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/version.h
libavformat/Makefile
libavformat/allformats.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01 10:46:39 +01:00
Martin Storsjö
50aef03b24
rtspenc: Make sure BYE packets are sent before TEARDOWN
...
Also make sure the BYE packets are sent at all when using
TCP interleaved transport.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-11-01 09:57:06 +02:00
Martin Storsjö
9ceed7af37
rtpenc: Add a rtpflag option for sending BYE packets when finishing
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-11-01 09:57:02 +02:00
Martin Storsjö
b264453de9
rtpenc: Remove some superfluous parentheses
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-11-01 09:56:28 +02:00
Martin Storsjö
d07b51bf07
aviobuf: Handle a NULL buffer in avio_close_dyn_buf
...
This simplifies proper error handling in rtsp.c/rtspdec.c. When
broadcasting over RTSP in TCP mode, the AVIOContext is closed and
recreated for each sent packet, and if the recreation fails, we might
try to close a NULL buffer when freeing things at the end.
Previously, if recreating the buffer in rtspdec.c failed, this would
crash later due to trying to close a NULL buffer.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-11-01 09:56:27 +02:00
Mickaël Raulet
b6a4701612
mpegts: Support HEVC demuxing
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-10-31 20:20:57 +01:00
Yusuke Nakamura
959bea13ce
matroskadec: Support HEVC demuxing
2013-10-31 20:20:49 +01:00
Yusuke Nakamura
ea29f965dc
mov: Support HEVC demuxing
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-10-31 20:20:32 +01:00
Dirk Farin
5846646296
Add raw HEVC demuxer
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-10-31 20:20:24 +01:00
Anton Khirnov
ce6949d3a0
oggparsetheora: stop using deprecated avcodec_set_dimensions
2013-10-31 20:14:14 +01:00
David Kment
9af7a8523a
HNM4/HNM4A demuxer & video decoder
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-10-31 17:45:46 +01:00
Michael Niedermayer
6c4b87d3d6
avformat/thp: force moving forward
...
Fixes infinite loop
Fixes Ticket3098
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-31 02:26:07 +01:00
Michael Niedermayer
2b1056e4e2
avformat/thp: fix variable types to avoid overflows
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-31 02:19:40 +01:00
Michael Niedermayer
b73900b8a6
avformat/http: fix cookies
...
Fixes Ticket3096
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-31 01:42:13 +01:00
Michael Niedermayer
7f019129e1
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
lavf: Remove a now useless parameter to ffurl_register_protocol
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-30 17:48:47 +01:00
Michael Niedermayer
7fd7a10efd
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
oggparsetheora: check av_mallocz result
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-30 10:41:06 +01:00
Michael Niedermayer
0b9e480b8f
Merge commit '5e5fb21877d8da7b3b8a27bb4d6a070d210c152d'
...
* commit '5e5fb21877d8da7b3b8a27bb4d6a070d210c152d':
oggparsetheora: return meaningful error codes
Conflicts:
libavformat/oggparsetheora.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-30 10:35:29 +01:00
Michael Niedermayer
70737b83f0
Merge commit 'd4c12b8be4bdd2ffddb3bd5e11773de4c4c46f68'
...
* commit 'd4c12b8be4bdd2ffddb3bd5e11773de4c4c46f68':
oggparsetheora: K&R cosmetics, reformat
Conflicts:
libavformat/oggparsetheora.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-30 10:26:00 +01:00
Martin Storsjö
0c5f839693
lavf: Remove a now useless parameter to ffurl_register_protocol
...
This was added in 9b07a2dc02
as an ABI hack to allow older
code built with lavf 52 to register protocols even if the size
of the URLProtocol struct was increased. Later, registering
protocols from outside of lavf was removed and this workaround
isn't needed any longer since lavf 53.
This removes an unchecked malloc and a memory leak for the cases
when this workaround actually was used - which it hasn't since
lavf 53.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-10-30 09:53:48 +02:00
Anton Khirnov
4f2d8968c0
oggparsetheora: check av_mallocz result
2013-10-30 08:45:31 +01:00
Anton Khirnov
5e5fb21877
oggparsetheora: return meaningful error codes
2013-10-30 08:45:25 +01:00
Anton Khirnov
d4c12b8be4
oggparsetheora: K&R cosmetics, reformat
...
Also typedef the private data struct and make its name consistent with
the rest of Libav.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-10-30 08:45:10 +01:00
Anssi Hannula
f86387b6c2
lavf/spdifdec: fix demuxing of AAC in IEC 61937
...
Return value of avpriv_aac_parse_header() is not checked correctly. Fix
it.
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-29 22:45:27 +01:00
Michael Niedermayer
249cc58c3a
Merge commit '8b64c2ba0382892cad9e1a5ba601696d4cbb4d04'
...
* commit '8b64c2ba0382892cad9e1a5ba601696d4cbb4d04':
lavc: add a dummy field to AVStream to preserve ABI compatibility for avconv
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-29 20:47:23 +01:00
Anton Khirnov
4eb49fdde8
lavf: remove unreliable timestamp guessing heuristic
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-29 20:10:41 +01:00
Clément Bœsch
8d55362fd0
avformat/avisynth: re-add trailing \n.
...
Regression since ac9529ce
.
Spotted by Timothy Gu.
2013-10-29 19:42:08 +01:00
Michael Niedermayer
6103faaa51
matroskaenc: fixed display width / height calculation for stereo mode
...
Based-on: patch by Asan Usipov <asan.usipov@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-29 16:08:00 +01:00
Anton Khirnov
8b64c2ba03
lavc: add a dummy field to AVStream to preserve ABI compatibility for avconv
...
avconv abuses the API by accessing AVStream.parser (which is private).
Removing AVStream.reference_dts in
2ba68dd044
breaks ABI compatibility for an
old avconv using a newer lavf. Fix this by adding a dummy field until
the next bump.
2013-10-29 14:19:10 +01:00
Derek Buitenhuis
25c7db7cc9
avio: Check for memory allocation failure of private data
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-10-29 11:40:15 +00:00
Michael Niedermayer
d3e13250a0
Merge commit 'feeafb4adabd5c17de1738ed9962e40892b20edb'
...
* commit 'feeafb4adabd5c17de1738ed9962e40892b20edb':
lavf: do not export av_register_{rtp,rdt}_dynamic_payload_handlers from shared objects
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-29 11:06:32 +01:00
Michael Niedermayer
f1f0b01c47
avformat/gxf: fix old codec id
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-28 23:54:42 +01:00
Stephen Hutchinson
f87a2e1272
avisynth: Factor out a couple of returns
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-28 22:30:43 +01:00
Stephen Hutchinson
ac9529ceec
avisynth: Simplify a stray av_log message
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-28 22:30:36 +01:00
Stephen Hutchinson
7ac67583c3
avisynth: Switch a couple of AVERROR_UNKNOWNs to AVERROR(ENOMEM)
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-28 22:30:20 +01:00
Stephen Hutchinson
c7f9aab801
avisynth: Use AV_* prefixes for video and audio IDs
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-28 22:26:56 +01:00
Stephen Hutchinson
cf31c1d4f8
avisynth: Remove outdated undef block
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-28 22:26:47 +01:00
Stephen Hutchinson
df6279e737
avisynth: Remove a couple of useless AviSynthContext casts
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-28 22:26:37 +01:00
Stephen Hutchinson
da9852670c
avisynth: Don't declare structs anonymously
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-28 22:26:28 +01:00
Stephen Hutchinson
d10d60be68
avisynth: Compact AvxSynth's avoidance of 2.6's colorspaces.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-28 22:26:14 +01:00
Stephen Hutchinson
2c18bfe6af
avisynth: Cosmetics
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-28 22:25:26 +01:00
Stephen Hutchinson
1549122d26
avisynth: Change most of the comments to /* */ from //
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-28 22:25:12 +01:00
Stephen Hutchinson
bd97ba72dc
avisynth: Introduce USING_AVISYNTH macro
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-28 22:24:58 +01:00
Peter Ross
69a042ee95
mpegts: demux synchronous SMPTE 336M Key-Length-Value (KLV) metadata
...
Fixes ticket #2579 .
2013-10-28 19:31:58 +01:00
Anton Khirnov
feeafb4ada
lavf: do not export av_register_{rtp,rdt}_dynamic_payload_handlers from shared objects
2013-10-28 15:29:49 +01:00
Michael Niedermayer
0436ffc294
Merge commit '53151723e377b9c43f876e20d7f27a17993256c8'
...
* commit '53151723e377b9c43f876e20d7f27a17993256c8':
avio: K&R formatting cosmetics
Conflicts:
libavformat/avio.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-28 12:17:57 +01:00
Anton Khirnov
2ba68dd044
lavf: remove unreliable timestamp guessing heuristic
2013-10-28 09:28:19 +01:00
Luca Barbato
53151723e3
avio: K&R formatting cosmetics
2013-10-28 00:04:50 +01:00
Derek Buitenhuis
d206fd996b
avio: Check for memory allocation failure of private data
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-10-27 19:15:03 +00:00
Michael Niedermayer
2ef1e62c8d
correct the AVOption documentation for AV_EF_CAREFUL
...
The flag was and is intended to be a sane default and thus does not enable
time consuming checks. This also matches how the flag is used in decoders and
demuxers.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-27 20:03:08 +01:00
Michael Niedermayer
4307026243
avformat/utils: make "first_dts not matching first dts in the queue" message more informative
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-27 17:41:06 +01:00
Michael Niedermayer
1e5271a9fd
avformat/utils: do not override pts in h264 when they are provided from the demuxer
...
Fixes Ticket2143
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-27 02:27:45 +02:00
Michael Niedermayer
d2db1bb7de
avformat/http: dont fail with unknown Content-Encodings
...
Fixes: http://m1.file.xiami.com/282/23282/343749/1769075752_709488_l.mp3
Based-on-patch-by: Crossle Song <sxm@yixia.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-26 19:20:01 +02:00
Michael Niedermayer
fcd08b7770
avformat/md5enc: add format, version and column headers
...
See Ticket2280
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-26 12:16:04 +02:00
lemonlinger@gmail.com
2cf94485de
avformat/rtpproto: when local rtp port and local rtcp port are not specified, try to make two successive ports and retry 3 times when failed
...
some video players on Android will not send udp hole punching messages if the rtcp port and rtp port are not two successive integers.
So, if the video player is behind NAT, it could not receive and rtp messages via udp
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-25 22:40:21 +02:00
Michael Niedermayer
ba8716df7f
avformat/mp3dec: perform seek resync in the correct direction
...
Fixes seeking to the last frame in CBR files
Fixes Ticket2773
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-25 19:37:03 +02:00
Michael Niedermayer
d04ec6ffc5
avformat/rmdec: english typos
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-25 19:14:36 +02:00
Michael Niedermayer
6abb9eb525
avformat/wavdec: Fix smv packet interleaving
...
This strips the relative timestamp "flag" off.
Fixes Ticket2849
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-25 12:50:26 +02:00
Michael Niedermayer
aaf02f6ede
avformat/rmdec: add some error messages
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-24 17:05:57 +02:00
Michael Niedermayer
f7106e00f7
avformat/rmdec: fix return code of ff_rm_parse_packet()
...
Broken by aecb9d3
Fixes assertion failure
Fixes Ticket3042
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-24 16:53:50 +02:00
Michael Niedermayer
210afae0ba
avformat/utils: Check size argument in ff_add_index_entry()
...
Fixes infinite loop
Fixes Ticket3061
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-24 12:58:09 +02:00
Michael Niedermayer
3ce7c62e1b
avformat/framehash: add software version to framecrc/md5
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-23 16:32:32 +02:00
James Almer
c994b42830
lavf/adtsenc: Add support for APE tags
...
Should fix ticket #2269
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-23 16:13:23 +02:00
Michael Niedermayer
76424b2da8
Merge commit 'e01fba5562133ac56a4f44c6f214a80ee33cb388'
...
* commit 'e01fba5562133ac56a4f44c6f214a80ee33cb388':
movenc: Add an F4V muxer
Conflicts:
Changelog
libavformat/allformats.c
libavformat/movenc.c
libavformat/version.h
See: 7bc70930dd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-23 12:05:48 +02:00
Clément Bœsch
e01fba5562
movenc: Add an F4V muxer
...
F4V is Adobe's mp4/iso media variant, with the most significant
addition/change being supporting other flash codecs than just
aac/h264.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-10-23 11:17:03 +03:00
Derek Buitenhuis
b1fcdc08ce
nut: Fix unchecked allocations
...
CC: libav-stable@libav.org
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-10-22 17:09:56 +01:00
Derek Buitenhuis
55ae13e3de
nut: Fix unchecked allocations
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-10-22 17:08:10 +01:00
Michael Niedermayer
23c0698499
Merge remote-tracking branch 'cigaes/master'
...
* cigaes/master:
lavf/tee: fix leak of bsfs array.
lavf/tee: fix leak of select option.
lavf/tee: fix leak of strdup/strtoked buffer.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-21 23:50:07 +02:00
Michael Niedermayer
7e3e653618
avformat/bintext: protect against potential overflow of chars_per_frame
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-21 23:37:49 +02:00
Nicolas George
c4e6024adc
lavf/tee: fix leak of bsfs array.
2013-10-21 17:32:01 +02:00
Nicolas George
5a12142aca
lavf/tee: fix leak of select option.
2013-10-21 17:32:01 +02:00
Nicolas George
59f809e992
lavf/tee: fix leak of strdup/strtoked buffer.
...
Fix CID 1108606.
2013-10-21 17:32:01 +02:00
Luca Barbato
ea71aafd68
avio: Use AVERROR_PROTOCOL_NOT_FOUND
...
When the protocol is missing ffurl_alloc() should return
AVERROR_PROTOCOL_NOT_FOUND instead of AVERROR(ENOENT).
Bug-Id: 577
CC: libav-stable@libav.org
2013-10-21 15:55:20 +02:00
Paul B Mahol
f5ed83c383
avformat/mxfdec; parse random index pack to get last partition offset and use it when footer partition offset is missing
...
Footer partition may not be present and even if present footer partition
offset may not be set in any partition except last one.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-21 13:29:30 +00:00
Clément Bœsch
4189fe11ff
avformat/vobsub: fix invalid sub queue access while seeking.
...
If there is only 1 stream and seek isn't called with a specific stream
index, we pick the first (and only) one.
Regression since dbfe6110
.
Fixes CID1108591.
2013-10-20 21:23:46 +02:00
Michael Niedermayer
88d4ff4b5f
avformat/utils: Check av_packet_new_side_data() return before using it
...
Fixes null pointer dereference
Fixes CID1108592
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-20 18:33:53 +02:00
Michael Niedermayer
eb5cc8febc
avformat/oggparsespeex: Check for extradata allocation failure
...
Fixes CID1108574
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-20 16:57:45 +02:00
Michael Niedermayer
2c1e075308
avformat/oggparseflac: check ff_alloc_extradata() return code
...
Fixes CID1108573
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-20 16:55:43 +02:00
Michael Niedermayer
b294a4beec
avformat/oggparsecelt/celt_header: fix memleak
...
Fixes: CID1108605
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-20 16:48:51 +02:00
Michael Niedermayer
baab248c49
avformat/network: check for fcntl() failure in ff_socket()
...
Fixes: CID1087075
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-20 16:34:32 +02:00
Michael Niedermayer
78e6f83ce0
avformat/au: add assert to help source code analyzers
...
See: CID1108585 and CID1108603
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-20 14:46:36 +02:00
Michael Niedermayer
6838e1f547
avformat/oggdec: favor av_freep() over av_free()
...
Found-by: Reimar Döffinger
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-19 22:50:16 +02:00
Michael Niedermayer
d5ec8ba7f2
Do not leave positive values undefined when negative are defined as error
...
Define positive return values as non errors and leave further meaning undefined
This allows future extensions to use these values
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-19 16:42:57 +02:00
Michael Niedermayer
fec6d547cc
avformat/wtvdec: drop SHIFT_SECTOR_BITS() macro
...
it just wraps around a bitwise shift, and makes the code harder to read
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-19 11:24:20 +02:00
Michael Niedermayer
2a5f4c1ea2
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
wtv: Seek by sector properly
Conflicts:
libavformat/wtvdec.c
See: a0d13d84a9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-19 11:11:34 +02:00
Michael Niedermayer
5d2a83571b
avformat/wtv: rename to wtv_common
...
This helps git matchup files on merges correctly
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-19 10:58:17 +02:00
Carl Eugen Hoyos
9860fb445a
Fix decoding of G.726 in AIFF.
...
Fixes ticket #1973 .
2013-10-18 19:53:47 +02:00
Carl Eugen Hoyos
6e65e34837
lavf/riff: Fix a comment.
...
FourCC aivx refers to (Sony) XAVC, not (Panasonic) AVC-Intra.
Spotted by Kieran Kunhya and Vincent Olivier.
2013-10-18 19:35:03 +02:00
Carl Eugen Hoyos
640c70ddc2
avformat: Use G726LE decoder for Sun AU files
...
fixes ticket #1955 as suggested by Roman.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-18 16:46:08 +02:00
Carl Eugen Hoyos
5b9f39860d
Support 4k AVC-Intra in mov.
2013-10-18 15:41:34 +02:00
Luca Barbato
2b72f8ac32
wtv: Seek by sector properly
...
Use an helper function to seek by sector to avoid possible mistakes
due shifting by WTV_SECTOR_BITS a 32bit integer.
Contrary to common intuition, a 32 bit integer left shifted
by a 64 bit integer does not promote the 32 bit integer to
64 bit before shifting.
2013-10-18 15:08:18 +02:00
Paul B Mahol
a688176535
avformat/flvdec: use avpriv_request_sample()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-18 09:55:16 +00:00
Michael Niedermayer
f90eb8cfc8
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
Add some necessary casts in the wtv demuxer.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-17 10:42:41 +02:00
Dirk Farin
56cf6151ae
avformat/hevcdec: add more irap cases to hevc_probe()
...
This fixes fate-hevc-conformance-RAP_A_docomo_4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-17 10:18:28 +02:00
Dirk Farin
2ac31773f3
avformat/hevcdec: cosmetics, whitespaces
...
This reduces the difference to the latest hevc demuxer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-17 10:14:11 +02:00
Carl Eugen Hoyos
a0d13d84a9
Add some necessary casts in the wtv demuxer.
...
This reverts e8023dba
, fixes ticket #3049 .
2013-10-17 09:54:03 +02:00
Carl Eugen Hoyos
d0b7d24b80
Support HEVC in transport streams.
2013-10-16 17:54:37 +02:00
Michael Niedermayer
f58cb772d9
avformat/mov: fix "correctly" typo
...
Found-by: Timothy Gu
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-16 00:26:10 +02:00
Yusuke Nakamura
16b6839de6
lavf/matroskadec: Support HEVC demuxing.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-16 00:17:28 +02:00
Yusuke Nakamura
53f903b7c5
lavf/mov: Support HEVC demuxing.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-16 00:17:28 +02:00
Mickaël Raulet
93c1fe4de3
hevc: add ts demux support
...
cherry picked from commit 925ee44364a7bce58e2ac5bac91077ce0a75d883
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-15 23:48:00 +02:00
Michael Niedermayer
12cc3bf29a
avformat: rename a few more h.265 to HEVC
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-15 21:23:57 +02:00
Stefano Sabatini
1120fd7852
lavf/segment: simplify logic and fix !=0 check on segment_end return value
...
A successfull return value can be > 0.
2013-10-15 15:17:22 +02:00
Billy Shambrook
67e507e10e
lavf/segment: log segments as they end to AV_LOG_VERBOSE
...
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2013-10-15 14:57:49 +02:00
Stefano Sabatini
3b9f8e7cd9
lavf/segment: simplify segment_count update
...
Now segment_count mark the segment_count of the current segment.
2013-10-15 14:55:48 +02:00
Michael Niedermayer
0a6ce255ab
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
http: Check the auth string contents and not only the pointer
Conflicts:
libavformat/http.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-15 09:34:27 +02:00
Vignesh Venkatasubramanian
d6f86d74ed
matroskadec: Demux support for SeekPreRoll and CodecDelay
...
Adds support for demuxing SeekPreRoll and CodecDelay container
elements.
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-14 21:06:59 +02:00
Michael Niedermayer
708b32b6f7
http: Check the auth string contents and not only the pointer
...
This makes sure we don't send the Except: 100-continue header
if no authentication credentials have been provided.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-10-14 21:57:15 +03:00
Paul B Mahol
42a8d8aee8
avformat/rpl: use avpriv_report_missing_feature/avpriv_request_sample
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-14 18:18:25 +00:00
Carl Eugen Hoyos
f7ed044eea
Support H.264 fourcc UMSV.
...
Fixes ticket #3046 .
2013-10-14 16:29:58 +02:00
Michael Niedermayer
953dd72321
Merge commit '84a125c4c28f3e3e215d2e6c32f7f0ec43bbc04c'
...
* commit '84a125c4c28f3e3e215d2e6c32f7f0ec43bbc04c':
rtmp: Allocate the prev_pkt arrays dynamically
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-14 15:31:11 +02:00
Martin Storsjö
84a125c4c2
rtmp: Allocate the prev_pkt arrays dynamically
...
Normally, all channel ids are between 0 and 10, while they in
uncommon cases can have values up to 64k.
This avoids allocating two arrays for up to 64k entries (at a total
of over 6 MB in size) each when most of them aren't used at all.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-10-14 14:27:35 +03:00
James Almer
1d4476d5da
movenc: use ff_alloc_extradata()
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-14 13:02:18 +02:00
James Almer
00408f95e7
oggparsecelt: use ff_alloc_extradata()
...
Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-14 13:01:42 +02:00
James Almer
aae8975ffb
oggparseopus: use ff_alloc_extradata()
...
Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-14 12:59:59 +02:00
Michael Niedermayer
5970f4bb02
avformat/http: check the auth string contents not the pointer which cannot be NULL
...
It appears this bug originates from a "work in progress" patch from
ffmpeg-devel that was heavily redesigned by and integrated in libav
And that patch even had a reply and review on the mailing list pointing
out that it had a bug.
This fixes a deadlock with ffserver
See: [FFmpeg-devel] [PATCH] Fix HTTP authentication problem for POST actions.
[FFmpeg-devel] [PATCH 1/3] Introduce auth_phase flag, which will be true if authorization needs to be sent, but the type of authorization is not known yet Partial fix #3036
[FFmpeg-devel] [PATCH 2/3] Only add Transfer-Encoding header when not in authorization phase, because server will wait (indefinitely) for data when receiving this header Partial fix #3036
[FFmpeg-devel] [PATCH 3/3] Only allow posting data and/or forcing a 200 code, enabling posting isml chunks, -after- we did a possible first request to get a 403 from the server telling us which type of authentication to apply Final part fix #3036
See: 71549a857b
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-14 01:35:28 +02:00
Michael Niedermayer
6b1b63df85
Merge commit '71549a857b13edf4c4f95037de6ed5bb4c4bd4af'
...
* commit '71549a857b13edf4c4f95037de6ed5bb4c4bd4af':
http: Support auth method detection for POST
Conflicts:
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-14 00:37:01 +02:00
Michael Niedermayer
5dee3e8bb4
Merge commit 'eb8b05a3824a9fa85e20d603595ac8a3b83505d4'
...
* commit 'eb8b05a3824a9fa85e20d603595ac8a3b83505d4':
http: Add an option for forcing basic authentication
Conflicts:
libavformat/http.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-14 00:17:49 +02:00
Paul B Mahol
5340c3dd8d
avformat/westwood_vqa: s/unsigned char/uint8_t & s/unsigned int/uint32_t
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-13 20:21:03 +00:00
Paul B Mahol
a807c68253
avformat: use ff_alloc_extradata()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-13 20:13:38 +00:00