Mika Raento
58e0402e02
segment: don't access outside seg->frames array
...
Fixes wrong number of segments output and undefined memory access.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-02 11:38:36 +02:00
Michael Niedermayer
4250753497
avformat/mpegts: favor DESC_types over probed codecs
...
Fixes Ticket3766
Fixes dvb_teletext detection
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-01 03:22:34 +02:00
Paul B Mahol
bd6f145820
avformat/dfa: use avio_feof()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2014-08-30 15:50:22 +00:00
wm4
b173f5c155
oggdec: fix invalid free on error
...
The read_packet callback passes a pointer to a stack-allocated AVPacket.
Attempting to free it with av_free() makes no sense.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-30 16:38:14 +02:00
Michael Niedermayer
ce36d80881
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
lavf/rtpdec_hevc: Fix compilation with -DDEBUG.
ffmpeg: Clean up if filter initialisation failed to avoid a memleak.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-30 14:38:44 +02:00
Carl Eugen Hoyos
f22c24bd7a
lavf/rtpdec_hevc: Fix compilation with -DDEBUG.
2014-08-30 13:01:51 +02:00
Michael Niedermayer
97cebf3139
avformat/udp: Move variables used only with HAVE_PTHREAD_CANCEL, under the #if
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-30 12:43:58 +02:00
Michael Niedermayer
19bf1ed1f4
avformat/id3v2: Fix "warning: unused variable uncompressed_buffer_size" if zlib is unavailable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-30 12:21:07 +02:00
Reimar Döffinger
d9e2aceb7f
Add missing "const" all over the place.
...
Only "./configure --enable-gpl" on x86 was tested.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2014-08-29 18:57:25 +02:00
Peter Ross
9b8eedd736
avformat/wtvdec: seek over broken chunks
...
Fixes ticket #3898
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-29 14:00:58 +02:00
Michael Niedermayer
72732f2ddd
avformat/webmdashenc: use av_strlcpy() and allocate enough space
...
Fixes out of array read
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-29 13:02:34 +02:00
Michael Niedermayer
37520a91ac
avformat: drop redundant MATROSKA_VIDEO_STEREO_MODE_COUNT identifier
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-29 01:26:52 +02:00
Michael Niedermayer
39cd9fdbf8
Merge commit '4d686fb721b485ebbc4c7779d927d876c1e630f7'
...
* commit '4d686fb721b485ebbc4c7779d927d876c1e630f7':
matroskaenc: convert avstream stereo3d side data during encoding
Conflicts:
libavformat/matroskaenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-29 00:44:47 +02:00
Michael Niedermayer
fcc3909908
Merge commit 'd4ae8ac92f619507aadd021bb67b517d39d3a36f'
...
* commit 'd4ae8ac92f619507aadd021bb67b517d39d3a36f':
matroskadec: parse stereo mode on decoding
Conflicts:
Changelog
libavformat/matroska.c
libavformat/matroskadec.c
See: 4c509fe305
and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-28 23:48:23 +02:00
Michael Niedermayer
f30a8154ab
Merge commit '9301486408a480629336af4d7fd873c0f28fb2d5'
...
* commit '9301486408a480629336af4d7fd873c0f28fb2d5':
avcodec: add stream-level stereo3d side data
Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavcodec/utils.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-28 22:23:01 +02:00
Michael Niedermayer
56cc754c76
Merge commit 'f2583bc86eb5d7decc639fc9a36edc93e6003eef'
...
* commit 'f2583bc86eb5d7decc639fc9a36edc93e6003eef':
matroska: list supported extensions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-28 22:12:36 +02:00
Vittorio Giovara
4d686fb721
matroskaenc: convert avstream stereo3d side data during encoding
...
Write the StereoMode Embl to bitstream.
2014-08-28 12:35:27 -04:00
Vittorio Giovara
d4ae8ac92f
matroskadec: parse stereo mode on decoding
...
Convert the Matroska stereo format to the Stereo3D format, and add a
Stereo3D side data to the stream.
Bump the doctype version supported.
Bug-Id: 728 / https://bugs.debian.org/757185
2014-08-28 12:33:26 -04:00
Vittorio Giovara
9301486408
avcodec: add stream-level stereo3d side data
2014-08-28 12:33:26 -04:00
Vittorio Giovara
f2583bc86e
matroska: list supported extensions
2014-08-28 12:33:25 -04:00
Paul B Mahol
0ddb0516f1
avformat/soxenc: return more meaningful error code
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2014-08-28 15:52:25 +00:00
Michael Niedermayer
d6bd29492c
avformat/icoenc: Remove deprecated use of codec_name
...
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-28 14:34:55 +02:00
Michael Niedermayer
e6516944a3
avformat/rtpdec_asf: fix compiler warning about const qualifier being discarded
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-27 23:53:53 +02:00
Michael Niedermayer
35debfc366
avformat/rdt: fix compiler warning about const qualifier being discarded
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-27 23:52:40 +02:00
Michael Niedermayer
7a2c380e93
avformat/aviobuf: remove uses of deprecated url_feof()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-27 22:30:07 +02:00
James Almer
d3e9bee6f7
lavf/mp3enc: don't abort if audio packets can't be buffered
...
Instead skip the picture streams and flush the queued audio packets.
Should address ticket #3851 .
Signed-off-by: James Almer <jamrial@gmail.com>
2014-08-27 13:51:34 -03:00
Anton Khirnov
75bbaf2493
mpegenc: limit the maximum muxrate
...
It is written to the file as a 22-bit value.
CC: libav-stable@libav.org
2014-08-27 06:21:54 +00:00
Michael Niedermayer
9e8ab36f54
avformat/mxfenc: dont warn about d10_channelcount being ignored if its not set
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-27 02:13:50 +02:00
Michael Niedermayer
7206221d56
Merge commit '4c8bd8ddb049950347a5018fecbca7ee25d48c44'
...
* commit '4c8bd8ddb049950347a5018fecbca7ee25d48c44':
os_support: Adjust an outdated #endif comment
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-26 20:40:40 +02:00
ThomasVolkert
e15824e75b
avformat/rtpdec_h261: Fix sanity checks
...
Fixes mbap and quant
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-26 20:37:58 +02:00
Diego Biurrun
4c8bd8ddb0
os_support: Adjust an outdated #endif comment
2014-08-26 06:34:41 -07:00
Michael Niedermayer
46ad2c4aed
avformat/utils: remove assert that tests the same condition as the if() directly above
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-26 15:23:23 +02:00
Michael Niedermayer
bf16872fec
avformat/nsvdec: fix out-commented asserts so the function names exist
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-26 15:21:25 +02:00
Michael Niedermayer
cf0e8e7ad4
Merge commit '4e9e6fa99f3ff83cedbf6c378d62065ae419a3b9'
...
* commit '4e9e6fa99f3ff83cedbf6c378d62065ae419a3b9':
mpeg: Write H264 streams at offset 2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-26 14:05:07 +02:00
Luca Barbato
4e9e6fa99f
mpeg: Write H264 streams at offset 2
...
It hints that the content is H264 according to HD-DVD.
2014-08-26 03:43:13 +02:00
ThomasVolkert
96b2ba68c4
avformat/rtpdec: support for HEVC/H.265 RTP payload format (draft v6) depacketizing
2014-08-26 02:18:08 +02:00
Alexander Strasser
db85d11d9d
libavformat/ftp: Do not leak memory in routine ftp_features
...
Setting the pointer to NULL inside both ftp_send_command
and ftp_features is redundant. Generally always setting to
NULL in ftp_send_command seems safer, but throughout the file
that parameter was always passed initialized. So I do it here
too for consistency.
Should fix CID1231988 (RESOURCE_LEAK)
OKed-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
2014-08-26 00:52:29 +02:00
Vignesh Venkatasubramanian
080acf7771
lavf/matroskadec: Ensure cues_end is initialized
...
Ensure that cues_start and cues_end are always initialized and
the webm_dash_manifest_cues function returns appropriate error if
they are not computed correctly.
This fixes coverity defect CID1231991.
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-25 18:25:39 +02:00
Michael Niedermayer
08a110ca87
Merge commit '6ee1cb5740e7490151db7dcec7e20ceaf8a2fe1f'
...
* commit '6ee1cb5740e7490151db7dcec7e20ceaf8a2fe1f':
libavformat: use MSG_NOSIGNAL when applicable
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-25 13:27:21 +02:00
Michael Niedermayer
215db2935b
Merge commit 'b263f8ffe7599d9cd27ec477a12700da8eb2790d'
...
* commit 'b263f8ffe7599d9cd27ec477a12700da8eb2790d':
lavf: add AVFormatContext.max_ts_probe
Conflicts:
doc/APIchanges
libavformat/avformat.h
libavformat/utils.c
libavformat/version.h
lavf-fate/mp3 changes as the estimated input bitrate changes and that is
copied to the output
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-25 13:25:09 +02:00
Rémi Denis-Courmont
6ee1cb5740
libavformat: use MSG_NOSIGNAL when applicable
...
If the remote end of a connection oriented socket hangs up, generating
an EPIPE error is preferable over an unhandled SIGPIPE signal.
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-08-25 10:49:14 +03:00
Anton Khirnov
b263f8ffe7
lavf: add AVFormatContext.max_ts_probe
...
It allows to configure how long will avformat_find_stream_info() wait
to get the first timestamp.
2014-08-25 05:17:54 +00:00
Michael Niedermayer
c2c4cee866
avformat/matroskaenc: Check alpha_mode
...
Fixes CID1231992
Suggested-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-24 20:33:17 +02:00
Paul B Mahol
6dfa70f272
Correct few "ffmpeg" typos
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2014-08-24 11:05:42 +00:00
Michael Niedermayer
1aa153d644
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
fate: Fix ffprobe tests with --target-path set.
doc/ffmpeg: Try to clarify that the input option -r is not the same as -framerate.
Do not print a useless error number if mov header reading fails.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-24 03:58:14 +02:00
ThomasVolkert
50a4d5cfc6
Add support for H.261 RTP payload format (RFC 4587)
2014-08-24 03:53:30 +02:00
Carl Eugen Hoyos
0744daa887
Do not print a useless error number if mov header reading fails.
...
The error string is printed by ffmpeg as for other demuxers.
2014-08-24 02:45:58 +02:00
Michael Niedermayer
9bff8cfc91
Merge commit 'f9f34cb9983ec6f4ef119c34b726d3b39c143110'
...
* commit 'f9f34cb9983ec6f4ef119c34b726d3b39c143110':
ogg: Use separate classes for the aliases
Conflicts:
libavformat/oggenc.c
See: 2ccc6ff03a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-23 21:42:13 +02:00
Luca Barbato
f9f34cb998
ogg: Use separate classes for the aliases
...
Unbreak 051aadeed1
2014-08-23 02:42:18 +02:00
Michael Niedermayer
300d489ac9
Merge commit '051aadeed104ecbe8ee4850ec2d7e5394f5e1ccd'
...
* commit '051aadeed104ecbe8ee4850ec2d7e5394f5e1ccd':
ogg: Provide aliases for Speex, Opus and audio-only ogg
Conflicts:
Changelog
libavformat/oggenc.c
libavformat/version.h
See: 2ccc6ff03a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-22 21:41:00 +02:00