Michael Niedermayer
7c521d4528
Merge commit '2de7650451d90520135d8cf6f96caa0658824208'
...
* commit '2de7650451d90520135d8cf6f96caa0658824208':
mmal: Move system headers before local headers
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-14 13:28:29 +02:00
wm4
13e4f2c7f7
mpeg4videodec: Remove useless messages
...
They seem to sometimes trigger with old AVI files. They are just
confusing, do not help anyone, and use sloppy language.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2015-04-14 12:32:43 +02:00
wm4
49e531ff47
mmal: Reference MMAL VC lib explicitly
...
This is optional, but ensures that linking with -Wl,--as-needed does not
drop the library containing the MMAL VC driver. The driver normally
"registers" itself in the library constructor, but since no symbols are
explicitly referenced, the linker could remove it with --as-needed
enabled.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2015-04-14 12:32:13 +02:00
wm4
2de7650451
mmal: Move system headers before local headers
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2015-04-14 12:32:10 +02:00
Ivan Efimov
2051b401cc
avfilter/drawtext: fix frame mem leak
...
Signed-off-by: Ivan Efimov <ioefimov@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-14 12:04:52 +02:00
Rostislav Pehlivanov
013498ba15
aacenc: Adjust the initial offset for PNS values
...
This commit adjusts the intial offset for PNS values, introduced
with commit f7f71b5795
earlier. This
commit shifts the value in such a way that no further offsets are
required in the aaccoder.c file. Earlier version of the PNS patch had 2 offsets in both the aaccoder and aacenc.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-14 03:42:57 +02:00
Michael Niedermayer
42a144f2c8
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
lavf/mpegtsenc: Accept 0x000001 as startcode for hevc.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-14 03:08:01 +02:00
Michael Niedermayer
89b3c5215a
avcodec/atrac3plusdec: Free mdct contexts at the end
...
Fixes memleak
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-14 02:31:37 +02:00
Carl Eugen Hoyos
d0c895d3c5
lavf/mpegtsenc: Accept 0x000001 as startcode for hevc.
...
Fixes ticket #4194 .
2015-04-14 01:57:38 +02:00
Michael Niedermayer
4d74c8d550
avcodec/ffv1: dont leave stale pointers in memory
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-13 20:08:42 +02:00
Michael Niedermayer
d19fc69f15
avcodec/ffv1: remove unneeded variable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-13 20:07:45 +02:00
Michael Niedermayer
a3963cc8ec
avcodec/ffv1: use av_freep()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-13 20:05:56 +02:00
Michael Niedermayer
fb6dd77000
Merge commit '73dacabfc9b9ef1fd2c08105fdab6238ee29c2fc'
...
* commit '73dacabfc9b9ef1fd2c08105fdab6238ee29c2fc':
ffv1: Check memory allocations
Conflicts:
libavcodec/ffv1.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-13 19:59:41 +02:00
Vittorio Giovara
73dacabfc9
ffv1: Check memory allocations
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2015-04-13 17:51:31 +02:00
wm4
f4f3065c69
h264: remove bogus YCgCo warning message
...
YCgCo decoding works just fine. It depends on the API user what is done
with the output. Some API users might support it, some not. Some users
might support it under certain circumstances only.
It is not the job of the decoder to print this message. If the API user
supports it, this message is extremely unhelpful.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-13 13:46:38 +02:00
Michael Niedermayer
d5dcd94630
avfilter/vf_scale: Add warning for AVCOL_SPC_YCGCO
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-13 13:45:41 +02:00
Rodger Combs
c69ff12dc3
lavf/mpeg: vobsub add an option to specify the .sub's URI
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-13 11:55:55 +02:00
James Almer
30ce065ffe
fate: add tta encoder test
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-13 11:33:02 +02:00
Rodger Combs
a4d58c97d0
lavf/http: handle case where the server returns a redirect during a seek
...
txoffer (e.g. http://tori.aoi-chan.com/ ) redirects to the same URI on your
first request, and serves the actual file on the second. It's stupid, but AFAIK
technically compliant. We'd previously see the server not handing back a Range
header and return an error; now, instead, we see that there's a redirect and
keep track of the offset we want while trying again at the new URL.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-13 11:18:50 +02:00
Rostislav Pehlivanov
f7f71b5795
aacenc: Add support for Perceptual Noise Substitution energy values
...
This commit implements support for writing the noise energy values used in PNS.
The difference between regular scalefactors and noise energy values is that the latter
require a small preamble (NOISE_PRE + energy_value_diff) to be written as the first
noise-containing band. Any following noise energy values use the previous one to
base their "diff" on. Ordinary scalefactors remain unchanged other than that they ignore the noise values.
This commit should not change anything by itself, the following commits will bring it in use.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-13 04:14:27 +02:00
Mark Reid
c919cc61a1
tests/fate: added mxf opatom audio regression tests
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-13 02:08:46 +02:00
Michael Niedermayer
818e889709
Merge commit '4e5443216445f3a9b8e6cb3fa4f448762e19006e'
...
* commit '4e5443216445f3a9b8e6cb3fa4f448762e19006e':
rtsp: Fix unchecked return value
See: aae9f52c4e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-13 01:44:36 +02:00
Michael Niedermayer
4dd0c07122
Merge commit '0b72a47f5592ecc035edd5bac57558ad9604612d'
...
* commit '0b72a47f5592ecc035edd5bac57558ad9604612d':
rtsp: Check a malloc return value
See: 4b03002527
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-13 01:35:08 +02:00
Himangi Saraogi
f03dfe118b
avformat/rtsp: Fix dereference after null check
...
This fixes CID 732219
Reviewed-by: Thomas Volkert <silvo@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-12 23:31:55 +02:00
Michael Niedermayer
ff50b1b13b
swresample/swresample-test: Randomly wipe out channel counts
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-12 22:21:53 +02:00
Michael Niedermayer
3c77bb5f23
swresample: Check channel layouts and channels against each other and print human readable error messages
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-12 22:21:34 +02:00
Michael Niedermayer
80a28c7509
swresample: Allow reinitialization without ever setting channel layouts
2015-04-12 22:21:34 +02:00
Michael Niedermayer
d7b9cb2f7a
swresample: Allow reinitialization without ever setting channel counts
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-12 22:21:34 +02:00
Himangi Saraogi
4e54432164
rtsp: Fix unchecked return value
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-04-12 23:08:14 +03:00
Himangi Saraogi
0b72a47f55
rtsp: Check a malloc return value
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-04-12 23:08:13 +03:00
James Almer
14edc9f3a3
configure: add missing h263p decoder dependencies
...
Should fix ticket #4480
Signed-off-by: James Almer <jamrial@gmail.com>
2015-04-12 15:48:55 -03:00
Timothy Gu
7ad27f1221
fate: Include branch information in the payload header
...
The server is properly equiped not to choke on that now.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-12 18:02:23 +02:00
Michael Niedermayer
445a02b1ec
avformat/rtpdec_asf: Fix potential pointer overflow
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-12 17:41:23 +02:00
Michael Niedermayer
870ec3f69e
avformat/segafilm: Use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-12 17:14:20 +02:00
Michael Niedermayer
4270a9f547
avformat/sierravmd: use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-12 17:14:20 +02:00
Paul B Mahol
d2fc702ace
avfilter: add chorus filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-04-11 20:39:43 +00:00
Mark Reid
415f1fab8d
libavformat/mxfenc: added support mxf opatom audio muxing
...
Previous version Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-12 02:40:09 +02:00
Timothy Gu
a202fe00ab
fate: Add atrac3+ tests
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-12 00:15:58 +02:00
Stephan Holljes
b51027fd18
libavformat/http.c: Make http-listen work as an input stream.
...
With this patch http can be used to listen for POST data to be used as an input stream.
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-11 23:10:44 +02:00
Michael Niedermayer
f944aeb07a
avformat/rtpproto: Move dscp into context & AVOptions
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-11 18:53:54 +02:00
Michael Niedermayer
816bbc1cf5
Merge commit 'bbdb50d7a8a91f38188fd15080d7f45f1540b3ac'
...
* commit 'bbdb50d7a8a91f38188fd15080d7f45f1540b3ac':
libx265: print supported presets and tunes on error
See: 61090db29a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-11 18:00:16 +02:00
Michael Niedermayer
6530e2ff0c
Merge commit '7a9b764c0737f42cf2458c3c5378b0df216e14a2'
...
* commit '7a9b764c0737f42cf2458c3c5378b0df216e14a2':
libdc1394: Unbreak build after c201069fa
See: fe25194c58
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-11 17:59:21 +02:00
James Almer
bbdb50d7a8
libx265: print supported presets and tunes on error
...
Based on code from libavcodec/libx264.c
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2015-04-11 11:13:28 -04:00
Michael Niedermayer
d6bcdf0dcd
avformat/xwma: Use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-11 13:51:03 +02:00
Michael Niedermayer
e33355213d
avformat/wtvenc: Use av_realloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-11 13:50:50 +02:00
Michael Niedermayer
e0d8ff5ef1
avformat/nsvdec: Use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-11 13:18:41 +02:00
Michael Kostylev
7a9b764c07
libdc1394: Unbreak build after c201069fa
2015-04-11 10:57:18 +02:00
Andrey Utkin
7f64a7503b
rtpenc_jpeg: handle case of picture dimensions not dividing by 8
...
This fixes the calculation of the number of needed blocks to make
sure that ALL pixels are represented by the result.
Reviewed-by: Thomas Volkert <silvo@gmx.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-11 02:26:56 +02:00
Michael Niedermayer
d4a6c94046
Merge commit '4f373a5111f900af54301907132942f95276285c'
...
* commit '4f373a5111f900af54301907132942f95276285c':
vfwcap: Unbreak building after c201069fa
Conflicts:
libavdevice/vfwcap.c
See: 4d0f6d3fb4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-11 02:19:32 +02:00
James Almer
9fc45681e0
doc: add aarch64 cpuflags to fftools documentation
...
Signed-off-by: James Almer <jamrial@gmail.com>
2015-04-10 20:57:19 -03:00