Michael Niedermayer
279b2a4deb
avformat/mp3dec: also accept Lavc as shortname to read delays
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-24 18:06:26 +02:00
Michael Niedermayer
2dbee1a393
avformat/mp3enc: Squeeze our mp3 encoder tag into the 9byte shortname instead of randomly truncating
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-24 16:15:25 +02:00
Michael Niedermayer
e744e9a305
Merge commit 'ef363ebd596da18f889a7d4845023a23dfac84c9'
...
* commit 'ef363ebd596da18f889a7d4845023a23dfac84c9':
mp3enc: write full LAME frame
Conflicts:
libavformat/mp3enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-24 15:30:12 +02:00
Michael Niedermayer
899d3706d8
Merge commit '99143140dea12363af680d02e23cb42cfe191679'
...
* commit '99143140dea12363af680d02e23cb42cfe191679':
mp3dec: fix reading the Xing tag
Conflicts:
libavformat/mp3dec.c
See: 19ff479f69
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-24 12:49:53 +02:00
Michael Niedermayer
2c5ae57776
Merge commit '6df9d9b55d3f56ee7782639a7678eeeaf77f14ea'
...
* commit '6df9d9b55d3f56ee7782639a7678eeeaf77f14ea':
lavf: Use av_gettime_relative
Conflicts:
libavformat/hls.c
See: f78bc96b7c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-24 12:40:36 +02:00
Anton Khirnov
ef363ebd59
mp3enc: write full LAME frame
...
Most importantly, it contains the encoder delay and replaygain info.
2014-10-24 09:03:16 +02:00
Anton Khirnov
99143140de
mp3dec: fix reading the Xing tag
...
The quality scale field is only supposed to be present if the fourth bit
is set. In practice, lame always sets it, but other tools might not.
CC:libav-stable@libav.org
2014-10-24 09:03:16 +02:00
Martin Storsjö
6df9d9b55d
lavf: Use av_gettime_relative
...
The ones left using av_gettime are NTP timestamps (for RTCP,
which is specified to send the actual current realtime clock
in RTCP SR packets), and the NUT muxer timestamper, which is
documented as using wallclock time.
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-10-24 09:53:45 +03:00
Andrey Utkin
08e6832a94
avformat/rtsp: pass return code from ffurl_open() on its failure
...
Previously, AVERROR(EIO) was returned. Now the value is passed from
lower level, thus it is possible to distinguish ECONNREFUSED, ETIMEDOUT,
ENETUNREACH etc.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-23 23:53:14 +02:00
Michael Niedermayer
7f2af3f56b
avformat/rtsp: add av_assert0() to clarify that the else case is supposed to be unreachable
...
If its reachable then theres a bug as err would be uninitialized
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-23 23:48:45 +02:00
Andrey Utkin
70c9d40008
avformat/http: pass return code from http_open_cnx_internal() on its failure
...
Previously, AVERROR(EIO) was returned on failure of
http_open_cnx_internal(). Now the value is passed to upper level, thus
it is possible to distinguish ECONNREFUSED, ETIMEDOUT, ENETUNREACH etc.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-23 20:58:21 +02:00
Michael Niedermayer
5ea0753a15
avformat/concatdec: Forward whitelists to the subdemuxers.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-23 18:19:37 +02:00
Michael Niedermayer
feb9057b83
Forward whitelists to the asf demuxer
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-23 18:19:37 +02:00
Michael Niedermayer
b76234c00c
avformat/avidec: Forward whitelists to the subtitle demuxer
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-23 18:19:37 +02:00
Michael Niedermayer
ad83cfec5a
avformat/mpeg: Forward whitelists to the mpegps demuxer
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-23 18:19:37 +02:00
Michael Niedermayer
ad5f861b8c
avformat/libquvi: Forward whitelists to subdemuxer
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-23 18:19:37 +02:00
Michael Niedermayer
c5e337431b
avformat/sapdec: Forward whitelists to sdp demuxer
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-23 15:28:49 +02:00
Michael Niedermayer
24cd4e5071
avformat/hls: forward whitelists to mpegts demuxer
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-23 15:26:46 +02:00
Michael Niedermayer
cebe8c8095
avformat/format: Use av_match_name() instead of list in av_match_ext()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-23 04:33:09 +02:00
Eejya Singh
6dc99fdf0e
Added STL demuxer and decoder
...
Signed-off-by: Clément Bœsch <u@pkh.me>
2014-10-22 23:12:38 +02:00
Michael Niedermayer
ec6a5fc6cc
avformat/mux: Fix assertion failure due to max_interleave_delta and poor input
...
Fixes Ticket4051
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-22 16:28:49 +02:00
Michael Niedermayer
a39201818f
avformat/matroskadec: Fix cluster parsing loop which gathers seek information
...
Fixes Ticket2263
Fixes Ticket3934
Reviewed-by: Rodger Combs <rodger.combs@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-22 13:40:28 +02:00
Carl Eugen Hoyos
b6e8f10bcb
lavf/cinedec: Fix a typo in the file header.
2014-10-22 01:37:02 +02:00
Michael Niedermayer
42316907b8
Merge commit 'af7ca6ea124b82b337a6b96e10963e88eba57ebe'
...
* commit 'af7ca6ea124b82b337a6b96e10963e88eba57ebe':
nutdec: check av_new_packet return value
Conflicts:
libavformat/nutdec.c
See: bb502411dd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-22 00:26:37 +02:00
Michael Niedermayer
dd3f1563d7
Merge commit 'b69183f65d0f6f4cd7a4e6c0deb57d59b0185aba'
...
* commit 'b69183f65d0f6f4cd7a4e6c0deb57d59b0185aba':
nutenc: check for negative index rather than assert
Conflicts:
libavformat/nutenc.c
Not merged, the assert is correct
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-22 00:09:00 +02:00
Michael Niedermayer
979062fe2f
Merge commit 'be42c0b8d57fe2ea769892d102ffd5561dc18709'
...
* commit 'be42c0b8d57fe2ea769892d102ffd5561dc18709':
rmdec: stricter error check to avoid theoretical unitialized use
Conflicts:
libavformat/rmdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-21 23:47:44 +02:00
Michael Niedermayer
840bc8e284
Merge commit '7207dd8f829baee58b4df6c97c19ffde77039e8d'
...
* commit '7207dd8f829baee58b4df6c97c19ffde77039e8d':
rmdec: check av_new_packet return value
Conflicts:
libavformat/rmdec.c
See: c01a462cda
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-21 23:01:26 +02:00
Michael Niedermayer
3099008f07
Merge commit '629b2ed0ac77d7c4bf1aeac5e70cafee5fa0fcae'
...
* commit '629b2ed0ac77d7c4bf1aeac5e70cafee5fa0fcae':
flvdec: make sure to check create_stream and report the same error
Conflicts:
libavformat/flvdec.c
See: d7d5b5dfc1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-21 22:35:30 +02:00
Michael Niedermayer
1922357e5a
Merge commit 'f22aa6b841dc54fa1dd804303885b1e230a5f629'
...
* commit 'f22aa6b841dc54fa1dd804303885b1e230a5f629':
flvdec: avoid unitialized use of a struct member
See: 396ddcf22d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-21 22:27:17 +02:00
Michael Niedermayer
4542615063
Merge commit 'e73d26bbd65f1ac5fc73ef3fd24cab1bed8ba2e2'
...
* commit 'e73d26bbd65f1ac5fc73ef3fd24cab1bed8ba2e2':
smoothstreamingenc: explict cast to avoid overflow
Conflicts:
libavformat/smoothstreamingenc.c
See: b399816d9c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-21 22:00:04 +02:00
Mika Raento
17702f1fc5
mov.c: reasonable bitrate for fragmented mp4
...
If using MFRA for timestamps, the stream may start from a large offset
and/or have gaps. With this change we calculate the bitrate based on
frames we've seen.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-21 18:06:18 +02:00
Vittorio Giovara
af7ca6ea12
nutdec: check av_new_packet return value
...
CC: libav-stable@libav.org
Bug-Id: CID 733713
2014-10-21 14:37:48 +01:00
Vittorio Giovara
b69183f65d
nutenc: check for negative index rather than assert
...
CC: libav-stable@libav.org
Bug-Id: CID 703721
2014-10-21 14:37:48 +01:00
Vittorio Giovara
be42c0b8d5
rmdec: stricter error check to avoid theoretical unitialized use
...
CC: libav-stable@libav.org
Bug-Id: CID 90558
2014-10-21 14:37:48 +01:00
Vittorio Giovara
7207dd8f82
rmdec: check av_new_packet return value
...
CC: libav-stable@libav.org
Bug-Id: CID 733714
2014-10-21 14:37:48 +01:00
Vittorio Giovara
629b2ed0ac
flvdec: make sure to check create_stream and report the same error
...
CC: libav-stable@libav.org
Bug-Id: CID 732242
2014-10-21 14:37:48 +01:00
Vittorio Giovara
f22aa6b841
flvdec: avoid unitialized use of a struct member
...
CC: libav-stable@libav.org
Bug-Id: CID 718141
2014-10-21 14:37:48 +01:00
Vittorio Giovara
e73d26bbd6
smoothstreamingenc: explict cast to avoid overflow
...
CC: libav-stable@libav.org
Bug-Id: CID 732248
2014-10-21 14:37:48 +01:00
Thilo Borgmann
6e6b79e7b8
lavf/mov.c: Prevent memory leak in case of invalid metadata reads.
...
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-21 12:36:52 +02:00
Andrey Utkin
282c9354f1
avformat/rtsp: Use ff_rtsp_averror()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-21 03:52:27 +02:00
Andrey Utkin
24dfd6e79b
avformat/rtspcodes: introduce ff_rtsp_averror()
...
Currently this is another name for ff_http_averror()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-21 03:51:14 +02:00
Michael Niedermayer
cec4e1c7c7
Merge commit 'd2771a1dc0a3695e8873adc16d068077f2417eea'
...
* commit 'd2771a1dc0a3695e8873adc16d068077f2417eea':
rtpproto: Free the addrinfo pointer on failure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-20 23:05:06 +02:00
Michael Niedermayer
5753d96771
Merge commit '96bfb677478514db73d1b63b4213c97ad4269e8f'
...
* commit '96bfb677478514db73d1b63b4213c97ad4269e8f':
nutdec: Prevent a memory corruption
Conflicts:
libavformat/nutdec.c
See: 05dd5368a9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-20 22:35:37 +02:00
Michael Niedermayer
e162db66a2
Merge commit '350ed1829268d343b791208c8fd1cddd44d52a8e'
...
* commit '350ed1829268d343b791208c8fd1cddd44d52a8e':
rtpdec_hevc: drop unnecessary check
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-20 22:25:14 +02:00
Michael Niedermayer
c04f125bb4
Merge commit '9fbc613f0df1628e7e78bca791fa8833846f8210'
...
* commit '9fbc613f0df1628e7e78bca791fa8833846f8210':
wtv: check seek_by_sector return value
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-20 21:43:44 +02:00
Michael Niedermayer
36552345d0
Merge commit 'd7f530b0d67fe3996dbfa990a47c865e0d1400a2'
...
* commit 'd7f530b0d67fe3996dbfa990a47c865e0d1400a2':
aviobuf: check context before using it
See: 7441d1ec33
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-20 21:25:37 +02:00
Thilo Borgmann
f31445a82d
lavf/mov.c: Allocate buffer in case of long metadata entries.
...
Fixes ticket #4018
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-20 19:27:34 +02:00
Luca Barbato
d2771a1dc0
rtpproto: Free the addrinfo pointer on failure
...
CC: libav-stable@libav.org
Bug-Id: CID 1238797
2014-10-20 10:47:29 +01:00
Luca Barbato
96bfb67747
nutdec: Prevent a memory corruption
...
Chapters do not have an event_flags field.
Bug-Id: CID 1231990
2014-10-20 10:47:03 +01:00
Vittorio Giovara
350ed18292
rtpdec_hevc: drop unnecessary check
...
len is always >=1 in that case.
Bug-Id: CID 1238784
2014-10-20 10:44:42 +01:00
Vittorio Giovara
322b571d55
rtmpproto: remove dead code
...
Expression already evaluated before, redundant since
0533868642
.
Bug-Id: CID 732199
2014-10-20 10:44:22 +01:00
Vittorio Giovara
9fbc613f0d
wtv: check seek_by_sector return value
...
CC: libav-stable@libav.org
Bug-Id: CID 1198258
2014-10-20 10:38:38 +01:00
Vittorio Giovara
d7f530b0d6
aviobuf: check context before using it
...
Avoid a possible null pointer dereference.
CC: libav-stable@libav.org
Bug-Id: CID 1135769
2014-10-20 10:38:38 +01:00
Michael Niedermayer
02484d1a93
avio: fix sizeof argument
...
CC: libav-stable@libav.org
Bug-Id: CID 732284
2014-10-20 10:38:38 +01:00
Vittorio Giovara
7b48bf9524
wtv: clean memory on error
...
CC: libav-stable@libav.org
Bug-Id: CID 718002
2014-10-20 10:38:38 +01:00
Vittorio Giovara
8ab3b71e4b
idcin: fix return check
...
CC: libav-stable@libav.org
Bug-Id: CID 732198
2014-10-20 10:38:37 +01:00
Andrey Utkin
81ce3f8e80
avformat/http: Use ff_http_averror()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-20 04:31:59 +02:00
Andrey Utkin
9d86ce783b
avformat/http: Introduce ff_http_averror()
...
int ff_http_averror(int status_code, int default_averror)
This helper function returns AVERROR_ value from 3-digit HTTP status
code.
Second argument, default_averror, is used if no specific AVERROR_ is
available. It is introduced because in different places of code
different return codes are used - -1, AVERROR(EIO), AVERROR_INVALIDDATA.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-20 04:31:46 +02:00
Kacper Michajłow
f22cf88fd3
rtmpproto: Don't mistake app for playpath.
...
For URLs "rtmp://server[:port]/foo" determine what `foo` refers to. If
application name has been defined by the user assume that `foo` is a
playpath, otherwise assume application name.
Signed-off-by: Kacper Michajłow <kasper93@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-19 18:52:30 +02:00
Michael Niedermayer
a71a5c911e
avformat/riff: Add UGY2
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-19 14:38:19 +02:00
Michael Niedermayer
057ea2a982
avformat: Add format_whitelist
...
This allows restricting demuxers to a list of needed ones for improved security
Note, some demuxers themselfs open other demuxers, these are only restricted if
AVOptions are forwarded to them. Please check that your code does that.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-19 04:37:30 +02:00
Michael Niedermayer
52bf4ad674
Merge commit '0034314a69e76a53534a74cceef865cfcb7b42cc'
...
* commit '0034314a69e76a53534a74cceef865cfcb7b42cc':
rtmp: Always call rtmp_close() on rtmp_open() failure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-18 23:48:21 +02:00
Alexander Drozdov
0034314a69
rtmp: Always call rtmp_close() on rtmp_open() failure
...
Prevent possible memory leaks.
Connect to nginx and request a non-existent resource to
trigger the issue.
CC: libav-stable@libav.org
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Uwe L. Korn <uwelk@xhochy.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-10-18 17:37:11 +02:00
Michael Niedermayer
83a897656a
Merge commit 'fb238f8230c1b0314985482207add548c68f83cf'
...
* commit 'fb238f8230c1b0314985482207add548c68f83cf':
urlprotocol: remove unused url_interrupt_cb declaration
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-18 12:16:04 +02:00
Anton Khirnov
fb238f8230
urlprotocol: remove unused url_interrupt_cb declaration
...
It is a remnant of the old interrupt callback API.
2014-10-18 05:01:20 +02:00
Michael Niedermayer
7891b4fa59
Merge commit '9bec3ca2b878c83d2337bc6095bd51c3e3f8eef0'
...
* commit '9bec3ca2b878c83d2337bc6095bd51c3e3f8eef0':
rtmpproto: Add pause support
Conflicts:
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-18 03:12:10 +02:00
Michael Niedermayer
178764e833
Merge commit 'f4cd8b80b9cb2a9a4112d8abb1d3b93cd3b4e467'
...
* commit 'f4cd8b80b9cb2a9a4112d8abb1d3b93cd3b4e467':
rtmpproto: Track last received timestamp
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-18 03:01:35 +02:00
Uwe L. Korn
9bec3ca2b8
rtmpproto: Add pause support
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-10-17 23:13:51 +03:00
Uwe L. Korn
f4cd8b80b9
rtmpproto: Track last received timestamp
...
Some RTMP commands need the most recent timestamp as their parameter, so
keep track of it. This must be the most recent one and not e.g. the max
received timestamp as it can decrease again through seeking.
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-10-17 23:13:37 +03:00
Mika Raento
75c8d7c2b4
hlsenc.c, segment.c: propagate defaults to mpegts
...
This fixes the abnormally high ts overhead in the files produced by the
HLS and segments muxers. See https://trac.ffmpeg.org/ticket/2857 . For
example makes it much more likely that it can produces streams that fit
under the 64kb App store limit.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-17 21:31:25 +02:00
Benoit Fouet
242f8bb3a8
avformat/id3v2: support buggy id3v2.3 tag length in id3v2.4
...
Some encoders do not use syncsafe sizes in v2.4 id3 tags. Check the next
tag to try to choose between the two.
Fixes ticket #4003
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-17 16:05:53 +02:00
Michael Niedermayer
3dda0bbe42
Merge commit 'e65c776d18dc14df8a279e017760862f9fc8763b'
...
* commit 'e65c776d18dc14df8a279e017760862f9fc8763b':
rtmpproto: Add getStreamLength call to query duration
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-17 15:34:27 +02:00
Michael Niedermayer
6cf9d02cea
Merge commit '324b23dde1bc8638959eb32419c95a93906db272'
...
* commit '324b23dde1bc8638959eb32419c95a93906db272':
rtmpproto: Add function to read a number response
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-17 15:21:40 +02:00
Michael Niedermayer
1aed82846c
avformat/m4vdec: mark as possibly containing discontinuities
...
This will be needed for the resolution change mpeg4 test
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-17 12:51:49 +02:00
Uwe L. Korn
e65c776d18
rtmpproto: Add getStreamLength call to query duration
...
In (non-live) streams with no metadata, the duration of a stream can
be retrieved by calling the RTMP function getStreamLength with the
playpath. The server will return a positive duration upon the request if
the duration is known, otherwise either no response or a duration of 0
will be returned.
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-10-17 12:07:19 +03:00
Uwe L. Korn
324b23dde1
rtmpproto: Add function to read a number response
...
Packets that contain a number as a result to a rtmp function call are
structured the same way (String, Number, Null, Number). This new method
also includes more bounds checks to better handle packets that are not
structured as expected.
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-10-17 12:07:19 +03:00
Luca Barbato
0db6bbb24c
avformat: Make avformat_free_context handle NULL
...
Work as the other free()-like functions.
Bug-Id: CID 1087081
CC: libav-stable@libav.org
2014-10-17 09:55:46 +01:00
Benoit Fouet
8bcf425d06
avformat/id3v2: silence a warning when CONFIG_ZLIB is unset.
...
dlen is only read when CONFIG_ZLIB is set, so mark it as possibly
unused.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-16 15:54:02 +02:00
Michael Lynch
460b509a34
rtsp: Check a memory allocation
...
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-10-16 09:19:03 +03:00
Di Wu
0e406aba14
mpegts: add the judgement if a new program is created successfully
...
Add the judement after create a new program to avoid segment fault.
Signed-off-by: Di Wu <di1028.wu@samsung.com>
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-16 04:21:21 +02:00
Michael Niedermayer
d267a0f8c1
avformat/util: Simplify av_guess_frame_rate() by using AVCodecContext.framerate
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-16 02:46:11 +02:00
Michael Niedermayer
004f1c6cf1
avformat/utils: Try to correct the codec_framerate in ff_compute_frame_duration() for the encoding case
...
No testcase where this makes a difference is known
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-16 02:46:02 +02:00
Michael Niedermayer
46f52274f3
avformat/oggparsedirac: use AVCodecContext.framerate
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-16 01:31:09 +02:00
Michael Niedermayer
917f86f479
Merge commit '79dd756e143a54efc25d64e90505f0dca6cbc4ec'
...
* commit '79dd756e143a54efc25d64e90505f0dca6cbc4ec':
rtmpproto: Fix a typo
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-16 00:02:54 +02:00
Michael Niedermayer
f09162c06b
Merge commit 'ced7238cd01cc2199acf9225305628641a27c1d7'
...
* commit 'ced7238cd01cc2199acf9225305628641a27c1d7':
rtpdec_hevc: Use av_realloc instead of av_malloc+memcpy
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-15 23:23:53 +02:00
Michael Niedermayer
60a876fe7b
Merge commit '752e71e74f50e7a6f9a19edb8e775b2ea2fb94d8'
...
* commit '752e71e74f50e7a6f9a19edb8e775b2ea2fb94d8':
rtpdec_hevc: Rename a variable for clarity
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-15 22:03:11 +02:00
Michael Niedermayer
16f9f7b881
Merge commit '74b02377980321934e33969c84733ace7e9f4eeb'
...
* commit '74b02377980321934e33969c84733ace7e9f4eeb':
mov: Correctly check the color transfer characteristics range
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-15 21:40:13 +02:00
Michael Niedermayer
1b54e6b12b
avformat/mov: auodetect "use_mfra_for"
...
Reviewed-by: Mika Raento <mikie@iki.fi>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-15 20:17:23 +02:00
Michael Lynch
c69f230a3a
avformat/rtsp: check memory allocation
...
Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Commit message by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-15 20:04:32 +02:00
Martin Storsjö
79dd756e14
rtmpproto: Fix a typo
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-10-15 21:00:39 +03:00
Martin Storsjö
ced7238cd0
rtpdec_hevc: Use av_realloc instead of av_malloc+memcpy
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-10-15 20:54:32 +03:00
Martin Storsjö
752e71e74f
rtpdec_hevc: Rename a variable for clarity
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-10-15 20:54:30 +03:00
Clément Bœsch
d281a87ae3
avformat/assdec: typo fix
2014-10-15 19:25:06 +02:00
Clément Bœsch
bf700a995d
avformat/assenc: support remuxing old V4 ASS form (SSA)
2014-10-15 19:24:40 +02:00
Michael Niedermayer
a9ed4f1d15
Merge commit 'e5cfc8fdad901c9487fe896421972852f38bcf5'
...
* commit 'e5cfc8fdad901c9487fe896421972852f38bcf5':
sdp: Provide out of bound parameter sets for HEVC if extradata is set
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-15 19:16:55 +02:00
Michael Niedermayer
6afc319eee
Merge commit '9b7f932ee568cadfc0f556a061fcc00cb63f9780'
...
* commit '9b7f932ee568cadfc0f556a061fcc00cb63f9780':
rtpdec_hevc: Parse out of band vps/sps/pps/sei from fmtp lines
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-15 19:04:22 +02:00
Michael Niedermayer
a92192d2e4
avformat/utils: use av_reduce() to simplify code and avoid overflow in ff_compute_frame_duration()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-15 18:23:21 +02:00
Michael Niedermayer
2b37864e7f
Merge commit '2d6e58497e76836604364b037df9b00ba3d75b69'
...
* commit '2d6e58497e76836604364b037df9b00ba3d75b69':
lavf: switch to AVCodecContext.framerate for demuxing
Conflicts:
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-15 18:19:58 +02:00
Vittorio Giovara
74b0237798
mov: Correctly check the color transfer characteristics range
...
Reported-by: Ruoyu <liangry@ucweb.com>
2014-10-15 14:48:40 +01:00
Martin Storsjö
e5cfc8fdad
sdp: Provide out of bound parameter sets for HEVC if extradata is set
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-10-15 12:12:54 +03:00