Michael Niedermayer
c054cff87a
Merge commit '9e06327ecb8f73c7904d10af7ad339c57cdaa788'
...
* commit '9e06327ecb8f73c7904d10af7ad339c57cdaa788':
xcbgrab: Move NULL check before pointer dereference
Conflicts:
libavdevice/xcbgrab.c
See: e86df0206f
2014-12-19 05:14:38 +01:00
Michael Niedermayer
d05b154b5b
Merge commit '5ac06633cb63fcc51f2471a3478b44d3f010b16b'
...
* commit '5ac06633cb63fcc51f2471a3478b44d3f010b16b':
takdec: check av_samples_get_buffer_size() return value
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-19 05:06:23 +01:00
Michael Niedermayer
69234e29ad
Merge commit '16c7a8a142277aa3c98b4802ee57daaebe6999e5'
...
* commit '16c7a8a142277aa3c98b4802ee57daaebe6999e5':
aacps: invert the order of parameters of ipdopd_reset()
See: 9f36ec6aa9
2014-12-19 05:05:23 +01:00
Michael Niedermayer
bf6e332cb4
Merge commit '76ccf114a6c107218e2a1948afc1d0fb3ac7ba0b'
...
* commit '76ccf114a6c107218e2a1948afc1d0fb3ac7ba0b':
rtsp: check ffurl_get_file_handle() return value
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-19 05:04:24 +01:00
Michael Niedermayer
988d27b802
Merge commit 'b1306823d0b3ae998c8e10ad832004eb13bdd93e'
...
* commit 'b1306823d0b3ae998c8e10ad832004eb13bdd93e':
check memory errors from av_strdup()
Conflicts:
avprobe.c
libavformat/matroskaenc.c
libavutil/opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-19 04:57:25 +01:00
Michael Niedermayer
76a8127a45
Merge commit '9745f19ffc9031ce480e43d7cf1053b58100d70f'
...
* commit '9745f19ffc9031ce480e43d7cf1053b58100d70f':
assdec: check the right variable
Conflicts:
libavcodec/assdec.c
See: cc7342f712
2014-12-19 04:54:27 +01:00
Michael Niedermayer
5387b0cbfb
Merge commit '971099ff5a85377579eb5b8d3620e283957f097e'
...
* commit '971099ff5a85377579eb5b8d3620e283957f097e':
aacenc: correctly check returned value
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-19 04:45:32 +01:00
Michael Niedermayer
445ec2dfcb
Merge commit 'ac467d94fa6d9d626f77d4ca8125a5eb1ad5425d'
...
* commit 'ac467d94fa6d9d626f77d4ca8125a5eb1ad5425d':
lcl: return an appropriate error code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-19 04:44:08 +01:00
Michael Niedermayer
6781ec6714
Merge commit '8b263331c5ebbb10b6ea521e9fd56751ba94254b'
...
* commit '8b263331c5ebbb10b6ea521e9fd56751ba94254b':
mpegts: check get16() return value
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-19 04:43:41 +01:00
Michael Niedermayer
5a1cd796e2
Merge commit '430a8168594b3cb29f44141d4da88f2c642de06f'
...
* commit '430a8168594b3cb29f44141d4da88f2c642de06f':
oggdec: add support for VP8 demuxing
Conflicts:
Changelog
libavformat/oggparsevp8.c
libavformat/version.h
See: d890db5f53
2014-12-19 04:36:45 +01:00
Michael Niedermayer
934f2d2f5c
Merge commit '38129c26c51b933d7db423f904ba0cd6a88ca1ed'
...
* commit '38129c26c51b933d7db423f904ba0cd6a88ca1ed':
cmdutils: check file access functions return values
Conflicts:
cmdutils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-19 04:31:17 +01:00
Michael Niedermayer
ff4f2036de
Merge commit 'c63dd3f0a48a9f6389d253597ab51caddc0118db'
...
* commit 'c63dd3f0a48a9f6389d253597ab51caddc0118db':
a64multi: check elbg return values
Conflicts:
libavcodec/a64multienc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-19 04:21:13 +01:00
Michael Niedermayer
bb7ad47ddf
Merge commit '3beb9cbad35218ed1fb3473eeb3cfc97a931bff4'
...
* commit '3beb9cbad35218ed1fb3473eeb3cfc97a931bff4':
roqvideo: check memory allocations and propagate errors
Conflicts:
libavcodec/roqvideoenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-19 04:20:30 +01:00
Michael Niedermayer
16f0618200
Merge commit 'ae2d41ec875965ce4ab9fdd88a5e8ba57cada67a'
...
* commit 'ae2d41ec875965ce4ab9fdd88a5e8ba57cada67a':
elbg: check memory allocations and propagate errors
Conflicts:
libavcodec/elbg.c
libavcodec/elbg.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-19 04:10:17 +01:00
Michael Niedermayer
bce06eb059
Merge commit '5d839778b9f3edb682b7f71dde4f80f07c75b098'
...
* commit '5d839778b9f3edb682b7f71dde4f80f07c75b098':
lavu: Refactor side data wiping
Conflicts:
libavutil/frame.c
See: a400edbb6d
2014-12-19 03:57:59 +01:00
Michael Niedermayer
1137ccef70
Merge commit 'effa7d2a6a260ca3ce801c180ee6131d67d665fb'
...
* commit 'effa7d2a6a260ca3ce801c180ee6131d67d665fb':
fate: add test for offset theora
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-19 03:55:02 +01:00
Michael Niedermayer
6fcdcc414b
Merge commit '67fc8a15e4182ea111cfcd05897709f09d99a33a'
...
* commit '67fc8a15e4182ea111cfcd05897709f09d99a33a':
theora: support different visible and coded frame size
Conflicts:
libavcodec/vp3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-19 03:42:16 +01:00
Michael Niedermayer
3e889713ce
Merge commit 'a381e0cec87bcb28ebc05fe840bb937a495de736'
...
* commit 'a381e0cec87bcb28ebc05fe840bb937a495de736':
fate: add a DPX parser test
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-19 03:33:42 +01:00
Michael Niedermayer
2e97437657
Merge commit '87bd298abeb901fe16383a0d267502cc7fc03878'
...
* commit '87bd298abeb901fe16383a0d267502cc7fc03878':
DPX parser
Conflicts:
libavcodec/dpx_parser.c
libavcodec/version.h
See: 8ec328668a
2014-12-19 03:30:40 +01:00
Michael Niedermayer
9aabe66781
Merge commit '3a3790b8f8b56ee6abc93ccac280eb693675e294'
...
* commit '3a3790b8f8b56ee6abc93ccac280eb693675e294':
tiff: support encoding and decoding 64bit images
Conflicts:
libavcodec/tiff.c
libavcodec/tiffenc.c
libavcodec/version.h
See: c714cd3bd4
2014-12-19 03:19:23 +01:00
Michael Niedermayer
c8e05c438f
Merge commit '59f0275dd0a42a7f90271a83a78e9ca5e69ff5b0'
...
* commit '59f0275dd0a42a7f90271a83a78e9ca5e69ff5b0':
movenc: Adjust the pts of new fragments similarly to what is done for dts
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-19 02:58:16 +01:00
Michael Niedermayer
7ef515cda5
Merge commit '8a70ef94b9c377293b3dfa7d92cdc81a4fe1543a'
...
* commit '8a70ef94b9c377293b3dfa7d92cdc81a4fe1543a':
libavformat: Add a muxer wrapping mpegts encoding into RTP
Conflicts:
Changelog
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-19 02:49:36 +01:00
Michael Niedermayer
5162af67f4
Merge commit 'a505c0d7373336a4cc5aa2022111c46bdd388b1f'
...
* commit 'a505c0d7373336a4cc5aa2022111c46bdd388b1f':
rtp: Initial H.261 support
Conflicts:
Changelog
libavformat/rtpdec_h261.c
libavformat/rtpenc_h261.c
libavformat/sdp.c
libavformat/version.h
See: 50a4d5cfc6
2014-12-19 02:34:17 +01:00
Michael Niedermayer
3f5d1c8130
Merge commit 'adc214e6797750285a5e62634b8521db521162ad'
...
* commit 'adc214e6797750285a5e62634b8521db521162ad':
rtpenc: Avoid brittle switch fallthroughs
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-19 02:24:24 +01:00
Michael Niedermayer
03d1467cf8
Merge commit '3bb465245fed6069512e6821000391beae8a6066'
...
* commit '3bb465245fed6069512e6821000391beae8a6066':
h261dec: Fix context initialization sequence
See: 6c1ee1a114
2014-12-19 02:16:20 +01:00
Reimar Döffinger
70d80ed40f
qdm2: Allow hard-coding VLC tables.
...
Also adds a lot of infrastructure necessary for it.
Some of it is a bit ugly though.
Increases binary size for hardcoded tables by about 12 kB,
which is about 15 kB from qdm2_table minus data and code
saved that was only used for creating it.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2014-12-18 23:51:07 +01:00
Reimar Döffinger
de6d44829c
aacps.c: Move large arrays to context to reduce stack usage.
...
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2014-12-18 23:50:41 +01:00
Vittorio Giovara
9e06327ecb
xcbgrab: Move NULL check before pointer dereference
...
Bug-Id: CID 1254668
2014-12-18 23:27:14 +01:00
Vittorio Giovara
5ac06633cb
takdec: check av_samples_get_buffer_size() return value
...
CC: libav-stable@libav.org
Bug-Id: CID 747734
2014-12-18 23:27:14 +01:00
Vittorio Giovara
16c7a8a142
aacps: invert the order of parameters of ipdopd_reset()
...
This is the order that the caller uses in the rest of the file. The
same operation is applied to both parameters, so this change is only
done for consistency, it doesn't change the actual behaviour.
Bug-Id: CID 732285 / CID 732286
2014-12-18 23:27:14 +01:00
Vittorio Giovara
76ccf114a6
rtsp: check ffurl_get_file_handle() return value
...
CC: libav-stable@libav.org
Bug-Id: CID 717844
2014-12-18 23:27:14 +01:00
Vittorio Giovara
b1306823d0
check memory errors from av_strdup()
2014-12-18 23:27:14 +01:00
Vittorio Giovara
9745f19ffc
assdec: check the right variable
...
CC: libav-stable@libav.org
Bug-Id: CID 1257815
2014-12-18 23:27:14 +01:00
Vittorio Giovara
971099ff5a
aacenc: correctly check returned value
...
CC: libav-stable@libav.org
2014-12-18 23:27:14 +01:00
Vittorio Giovara
ac467d94fa
lcl: return an appropriate error code
2014-12-18 23:27:14 +01:00
Vittorio Giovara
8b263331c5
mpegts: check get16() return value
...
And break flow of execution rather than exiting the function.
CC: libav-stable@libav.org
Bug-Id: CID 732186
2014-12-18 23:27:13 +01:00
James Almer
430a816859
oggdec: add support for VP8 demuxing
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-12-18 23:27:07 +01:00
Vittorio Giovara
38129c26c5
cmdutils: check file access functions return values
...
CC: libav-stable@libav.org
Bug-Id: CID 703706
2014-12-18 23:23:00 +01:00
Vittorio Giovara
c63dd3f0a4
a64multi: check elbg return values
2014-12-18 23:22:59 +01:00
Vittorio Giovara
3beb9cbad3
roqvideo: check memory allocations and propagate errors
2014-12-18 23:22:59 +01:00
Vittorio Giovara
ae2d41ec87
elbg: check memory allocations and propagate errors
2014-12-18 23:22:59 +01:00
Luca Barbato
5d839778b9
lavu: Refactor side data wiping
...
And make sure the nb_side_data field is reset as well.
Based on an initial patch from wm4 <nfxjfg@googlemail.com>.
CC: libav-stable@libav.org
2014-12-18 23:22:59 +01:00
Vittorio Giovara
effa7d2a6a
fate: add test for offset theora
2014-12-18 23:22:59 +01:00
Vittorio Giovara
67fc8a15e4
theora: support different visible and coded frame size
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-12-18 23:22:59 +01:00
Vittorio Giovara
a381e0cec8
fate: add a DPX parser test
2014-12-18 23:22:59 +01:00
Paul B Mahol
87bd298abe
DPX parser
...
Additional improvements and fixes by Michael Niedermayer <michaelni@gmx.at>.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-12-18 23:22:59 +01:00
Carl Eugen Hoyos
3a3790b8f8
tiff: support encoding and decoding 64bit images
2014-12-18 23:22:59 +01:00
Martin Storsjö
59f0275dd0
movenc: Adjust the pts of new fragments similarly to what is done for dts
...
The pts and the corresponding duration is written in sidx
atoms, thus make sure these match up correctly.
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-12-18 23:14:27 +02:00
Martin Storsjö
8a70ef94b9
libavformat: Add a muxer wrapping mpegts encoding into RTP
...
Since this structurally is quite different from normal RTP
(multiple streams are muxed into one single mpegts stream,
which is packetized into one single RTP session), it is kept
as a separate muxer.
Since this structurally also behaves differently than normal
RTP, all of the other muxers that do chained RTP muxing
(rtsp, sap, mp4) would need to be updated similarly to handle
this - in particular, creating one single rtp_mpegts muxer
for the whole presentation instead of one rtp muxer per stream.
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-12-18 23:12:33 +02:00
Thomas Volkert
a505c0d737
rtp: Initial H.261 support
...
The packetizer only supports splitting at GOB headers - if
such aren't available frequently enough, it splits at any
random byte offset (not at a macroblock boundary either, which
would be allowed by the spec) and sends a payload header pretend
that it starts with a GOB header.
As long as a receiver doesn't try to handle such cases cleverly
but just drops broken frames, this shouldn't matter too much
in practice.
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-12-18 23:11:37 +02:00
