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
Rodger Combs
315f9e929d
ffmpeg_opt: Add -start_at_zero option.
...
This automatically shifts input timestamps to start at 0 instead of the file's
starting timestamp when using -copyts.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-21 03:31:33 +02:00
Michael Niedermayer
832b4c0a86
avcodec/libutvideodec: print extradata size if unsupported
...
Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-21 03:05:49 +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
20d3348e8a
Merge commit '322b571d5591978efd6f6fee12181ac8900079fe'
...
* commit '322b571d5591978efd6f6fee12181ac8900079fe':
rtmpproto: remove dead code
See: 3a8b66af6c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-20 22:09:23 +02:00
Michael Niedermayer
2e0ac145d5
Merge commit 'd1afd3e1d6e43f4d37ae147091f270124ac48e04'
...
* commit 'd1afd3e1d6e43f4d37ae147091f270124ac48e04':
vf_format: check input validity
See: ee16e0cacc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-20 22:02:45 +02:00
Lukasz Marek
e493814d61
lavd: export all symbols with av_ prefix
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-10-20 22:01:36 +02:00
Michael Niedermayer
6ef4e0c8b8
Merge commit '7b48bf95242ebf95366d24d32e4cfca6aa77c5e2'
...
* commit '7b48bf95242ebf95366d24d32e4cfca6aa77c5e2':
wtv: clean memory on error
See: e47024d72f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-20 21:52:51 +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
Michael Niedermayer
54112629f1
Merge commit '02484d1a9316a9309fc1830825345ab79f6a8d60'
...
* commit '02484d1a9316a9309fc1830825345ab79f6a8d60':
avio: fix sizeof argument
See: a96577df38
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-20 21:17:25 +02:00
Michael Niedermayer
ab077b3d7a
Merge commit '8ab3b71e4b343cec3fa369a880ab4496d7345154'
...
* commit '8ab3b71e4b343cec3fa369a880ab4496d7345154':
idcin: fix return check
See: ee884c3023
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-20 21:00:18 +02:00
Rong Yan
a001db2e2c
configure: fix bug to ensure that HAVE_VSX is only enabled when HAVE_ALTIVEC is enabled and in LE environment
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-20 19:58:02 +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
Brad Smith
04a4fb81b3
v4l2: Make use of the VIDIOC_ENUM_FRAMESIZES ioctl on OpenBSD
...
Make use of the V4L2 VIDIOC_ENUM_FRAMESIZES ioctl on OpenBSD.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-20 14:56:58 +02:00
Kevin Mitchell
ff68ceb1b5
avfilter/vf_idet: add both multiple and single frame detection metadata
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-20 14:52:27 +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
d1afd3e1d6
vf_format: check input validity
...
CC: libav-stable@libav.org
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
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
8ab3b71e4b
idcin: fix return check
...
CC: libav-stable@libav.org
Bug-Id: CID 732198
2014-10-20 10:38:37 +01:00
Michael Niedermayer
b5583fc3e0
avutil/cast5: Fix off by one error
...
Fixes fate-cast5 on alpha
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-20 05:41:26 +02: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
Michael Niedermayer
d4e62ebae7
avcodec/snowenc: remove redundant FF_MPV_OFFSET()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-20 04:09:43 +02:00
Clément Bœsch
c669af0f24
avcodec/ass: add ASS trailing \r\n in one single place
2014-10-19 23:24:34 +02:00
Clément Bœsch
3d25869605
avcodec/ass: assume raw=0 in ff_ass_add_rect_bprint
2014-10-19 23:24:34 +02:00
Andrey Utkin
65639e6bef
avutil/error: Introduce new error codes for 4XX and 5XX replies from remote servers
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-19 22:32:14 +02:00
Michael Niedermayer
f63d381387
ffprobe: Add support for color_trc/color_pri/chroma_loc
...
Idea from: a2c00d22e7
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-19 20:15:37 +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
Nicholas Robbins
22cfa1f759
libavfi: added option to vf_perspective to specify transformation by giving destinations of corners of source.
...
Signed-off-by: Nicholas Robbins <nickrobbins@yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-19 17:59:53 +02:00
Kevin Mitchell
9d51bad625
avfilter/vf_idet: add counts to frame metadata
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-19 15:03:13 +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
Simon Thelen
69071e8e9c
doc/filters: fix localtime drawtext example.
...
The colon after the localtime function call needs an additional layer of
escaping or else everything until the next colon is treated as a
fontfile.
Signed-off-by: Simon Thelen <ffmpeg-dev@c-14.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-19 05:06:15 +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
5c8eb16769
avcodec: add codec_whitelist
...
This allows restricting decoders to a list of needed ones for improved security
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-19 04:36:52 +02:00
Michael Niedermayer
e23af4662d
avcodec/utils: Display pixel format information as none ... if unknown instead of omitting it
...
This is similar to 20a5956b8d
The difference this change makes affects only rather few files
but looks like:
Stream #0:1: Video: mjpeg, 90k tbr, 90k tbn, 90k tbc
vs.
Stream #0:1: Video: mjpeg, none(bt470bg/unknown/unknown), 90k tbr, 90k tbn, 90k tbc
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-19 04:18:13 +02:00
Michael Niedermayer
765abb3b76
avcodec/libvpxenc: use av_freep(), do not leave stale pointers in memory
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-19 03:04:04 +02:00
Michael Niedermayer
c5e295cb9d
avcodec/mpegaudiodec_template: use av_freep(), do not leave stale pointers in memory
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-19 03:03:40 +02:00
Michael Niedermayer
993a2487de
avcodec/nellymoserenc: use av_freep(), do not leave stale pointers in memory
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-19 03:03:04 +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
Michael Niedermayer
fa040c2247
Merge commit 'fc1eda543c6ef043300612db90da5cfd972af650'
...
* commit 'fc1eda543c6ef043300612db90da5cfd972af650':
swscale: fix sign extensions in yuv planar conversion
Conflicts:
libswscale/rgb2rgb_template.c
See: a07e9d72a1
See: a30972609c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-18 23:40:50 +02:00