Uwe L. Korn
7ce3bd9614
rtmpproto: Support alternative slist parameter in rtmp URLs
...
Support the URL scheme where the playpath is in an RTMP URL is
passed as the slist argument and the app is given infront of the
query part of the URL:
rtmp://host[:port]/[app]?slist=[playpath]
(other arguments in the query part are stripped as they are not used)
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-05-06 23:41:56 +03:00
Michael Niedermayer
fc7d0d8201
avcodec/x86/hevcdsp_init: fix SSE4 checks
...
Found-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-06 18:27:49 +02:00
Michael Niedermayer
7be230b5fa
avcodec/x86/Makefile: remove duplicate line
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-06 18:23:42 +02:00
Michael Niedermayer
3b3db02f2e
avcodec/x86/hevcdsp_init: fix build on 32bit
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-06 18:23:42 +02:00
plepere
7a2491c436
HEVC : added assembly MC functions
...
pretty print x86
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-06 18:23:36 +02:00
Mickaël Raulet
83976e40e8
hevc: C code update for new motion compensation
...
pretty print C
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-06 18:22:34 +02:00
Michael Niedermayer
760a9ef451
Merge remote-tracking branch 'cus/stable'
...
* cus/stable:
mpegts: always reset pes packet state on new packet
mpegts: unref buffer in reset_pes_packet_state
mpegts: factorize pes packet state reset function
mpegts: fix indentation after last commit
mpegts: only emit new packets if data buffer exists
mpegts: remove uneeded buf_size check
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-06 15:39:56 +02:00
Matt Oliver
ac9869ffb0
x86/mpegaudiodsp.c: msvc compilation error without sse/avx_external
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-06 14:15:02 +02:00
Lukasz Marek
38b722e7d7
gitignore: add tools/uncoded_frame
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-06 14:14:32 +02:00
Michael Niedermayer
7db0f9bef1
avcodec/mpeg4videoenc: fix alternative implementation of mpeg4_encode_dc()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-06 05:36:10 +02:00
Michael Niedermayer
141a84688f
avcodec/mpeg4videodec: fix mcbpc error messages
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-06 05:34:00 +02:00
Michael Niedermayer
2baf1c8c60
avcodec/snowenc: Fix "incompatible pointer type" warning
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-06 01:03:58 +02:00
Michael Niedermayer
5fc4c00972
avfilter/af_bs2b: Fix incompatible pointer type warnings
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-06 01:01:02 +02:00
Michael Niedermayer
89d2fc62db
avcodec/svq3: Fix "incompatible pointer type" warnings
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-05 23:30:35 +02:00
Michael Niedermayer
1394e0a9e0
avformat/segment: Use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-05 23:11:04 +02:00
Marton Balint
6c5375100c
mpegts: always reset pes packet state on new packet
...
Fixes ticket #3584 .
Signed-off-by: Marton Balint <cus@passwd.hu>
2014-05-05 22:33:52 +02:00
Marton Balint
a78274329c
mpegts: unref buffer in reset_pes_packet_state
...
Signed-off-by: Marton Balint <cus@passwd.hu>
2014-05-05 22:33:52 +02:00
Marton Balint
d7ca914988
mpegts: factorize pes packet state reset function
...
Signed-off-by: Marton Balint <cus@passwd.hu>
2014-05-05 22:33:52 +02:00
Marton Balint
e2752de344
mpegts: fix indentation after last commit
...
Signed-off-by: Marton Balint <cus@passwd.hu>
2014-05-05 22:33:52 +02:00
Marton Balint
9ba8debce9
mpegts: only emit new packets if data buffer exists
...
I don't think this can acutally happen in the current code, but better safe
than sorry.
Fixes Coverity CID 732217.
Signed-off-by: Marton Balint <cus@passwd.hu>
2014-05-05 22:33:52 +02:00
Marton Balint
a82e87618f
mpegts: remove uneeded buf_size check
...
It is already ensured by the loop condition
Signed-off-by: Marton Balint <cus@passwd.hu>
2014-05-05 22:33:52 +02:00
Michael Niedermayer
4aa7848eb8
avutil/file_open: Use av_mallocz_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-05 19:00:38 +02:00
Michael Niedermayer
e77ffaa0ac
tests/tiny_ssim: more correct error message
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-05 19:00:14 +02:00
Michael Niedermayer
2ded57216e
avutil/audio_fifo: Use av_mallocz_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-05 18:59:56 +02:00
Michael Niedermayer
b395167d56
tools/ismindex: use av_mallocz_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-05 18:47:24 +02:00
Michael Niedermayer
a69e16a97e
tests/tiny_ssim: check dimensions
...
Fix integer overflow
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-05 18:47:24 +02:00
Lukasz Marek
78d3453c4a
lavu/fifo: add const to arguments
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-05 17:32:24 +02:00
Michael Niedermayer
47550e62bf
avformat/astenc: avoid using AVCodecContext.frame_number
...
Theres no gurantee that the user application has initialized it
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-05 16:46:47 +02:00
Michael Niedermayer
ba040d4c8c
Merge commit '3828eb8519c1530392ab8820b1aa784602128afc'
...
* commit '3828eb8519c1530392ab8820b1aa784602128afc':
libfdk-aac: Relicense the library wrappers to 2-clause BSD
Conflicts:
libavcodec/libfdk-aacdec.c
libavcodec/libfdk-aacenc.c
<Daemon404> michaelni, fyi, for the fdk relicensing, wbs also contact all the ffmpeg-only contributers
<Daemon404> so it should be fine to merge.
Thanks-to: Martin Storsjö <martin@martin.st>
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-05 16:18:15 +02:00
Michael Niedermayer
db9c138616
Merge commit '15fa856b82ea7dbbf69edc1074eb13dd00b0fa84'
...
* commit '15fa856b82ea7dbbf69edc1074eb13dd00b0fa84':
libfdk-aacenc: Enable 7.1 channel encoding
See: 91489d28ba
, and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-05 15:58:40 +02:00
Michael Niedermayer
d5ec1ddf7b
Merge commit '9580818c5d934bde65a95efd2cee61c174721092'
...
* commit '9580818c5d934bde65a95efd2cee61c174721092':
avconv: rename OutputStream.opts to OutputStream.encoder_opts
Conflicts:
ffmpeg.c
ffmpeg.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-05 15:51:55 +02:00
Michael Niedermayer
22ffa5390f
Merge commit '01947f07b81a57fb1e15114b710f6d5ae4f70a11'
...
* commit '01947f07b81a57fb1e15114b710f6d5ae4f70a11':
avconv: remove a useless line
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-05 15:09:55 +02:00
Michael Niedermayer
1efc089218
Merge commit '65ed9e7585e86e6c728bc762ac9944b157e39f8d'
...
* commit '65ed9e7585e86e6c728bc762ac9944b157e39f8d':
avconv: rename 'codec' to 'enc_ctx'
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-05 15:03:52 +02:00
Michael Niedermayer
1f40536cca
Merge commit '650a5206a944fd36a42d92f98e745972056b1f7c'
...
* commit '650a5206a944fd36a42d92f98e745972056b1f7c':
avconv: rename 'icodec' to 'dec_ctx'
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-05 14:55:26 +02:00
Michael Niedermayer
42b7bda41a
Merge commit 'f3a6ad22c977c8fea87c4c5e4535061db6324d66'
...
* commit 'f3a6ad22c977c8fea87c4c5e4535061db6324d66':
avconv: rename InputStream.opts to InputStream.decoder_opts
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-05 14:44:33 +02:00
Michael Niedermayer
6e39707438
Merge commit '73ed8558a61c4f1d0ce8d1f35183ac1a0a4e31e3'
...
* commit '73ed8558a61c4f1d0ce8d1f35183ac1a0a4e31e3':
avconv: simplify exit_program() by using more local vars
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-05 14:39:13 +02:00
Martin Storsjö
3828eb8519
libfdk-aac: Relicense the library wrappers to 2-clause BSD
...
This should make it possible for Fraunhofer to contribute to these
wrappers - they didn't want to contribute to code under LGPL2.1 with
the "or any later version" clause (which allowed using the code
under the LGPL3 license).
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-05-05 14:18:43 +03:00
Jean First
15fa856b82
libfdk-aacenc: Enable 7.1 channel encoding
...
7.1(wide) and 7.1(wide-side) channel layouts are supported in
fdk-aac since the 0.1.3 release.
The earlier versions of fdk-aac didn't include any library
version defines in the public headers, thus checking for
the AACENCODER_LIB_VL0 define is enough to know that we're
building against a new enough version of fdk-aac.
This change includes contributions by Tim Walker,
Michael Niedermayer and Timothy Gu.
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-05-05 14:01:53 +03:00
Carl Eugen Hoyos
db01de4c0a
Fix standalone compilation of sonic lossless encoder.
2014-05-05 09:14:31 +02:00
Michael Niedermayer
6bd1741231
avfilter/f_select: fix incompatible pointer type warning
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-05 05:51:50 +02:00
Michael Niedermayer
ebf2c2c3a8
avcodec/lossless_videodsp: fix incompatible pointer type warning
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-05 05:49:18 +02:00
Hendrik Leppkes
ae8e2d7634
avisynth: set duration of audio streams
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-05 04:38:33 +02:00
Michael Niedermayer
656fe7ecce
swscale/utils: use FF_ALLOC(Z)_ARRAY_OR_GOTO() and av_malloc(z)_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-04 19:49:06 +02:00
Michael Niedermayer
beecfa81ac
avutil/pca: Use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-04 19:00:16 +02:00
Michael Niedermayer
35e16b1bab
MAINTANERS: update snow/ffv1/nut entries as these are no longer in a single file
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-04 18:57:15 +02:00
Michael Niedermayer
aeeb3d4605
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
Map --enable-lto to -ipo when compiling with icc.
Disable inline_asm_direct_symbol_refs if lto was requested.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-04 18:30:06 +02:00
Carl Eugen Hoyos
431c7bd3f4
Map --enable-lto to -ipo when compiling with icc.
2014-05-04 17:16:26 +02:00
Carl Eugen Hoyos
a64df19c5b
Disable inline_asm_direct_symbol_refs if lto was requested.
...
This fixes link time optimizations with gcc without disabling inline asm.
Fixes ticket #2941 .
2014-05-04 17:09:21 +02:00
Lukasz Marek
c9a12fdd2d
lavf/mux: pass options to nested structs of priv data
...
This is continuation of commit 330d547e
Nested struct is set in two places.
Previous commit set nested struct only in one case.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-04 14:46:37 +02:00
Michael Niedermayer
336901e060
avcodec/h263dec: use AV_EF_IGNORE_ERR
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-04 13:24:40 +02:00