]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Fri, 18 Apr 2014 02:38:44 +0000 (04:38 +0200)]
Merge remote-tracking branch 'lukaszmluki/master'
* lukaszmluki/master:
lavd/pulse_audio_enc: implement pause messages
lavd/pulse_audio_enc: implement volume messages
lavd/avdevice: add volume messages
lavd/pulse_audio_enc: add buffer fullness messages
lavd/pulse_audio_enc: add nonblocking mode
lavd/pulse_audio_enc: replace simple API with async API
lavd/pulse_audio_enc: cosmetics
lavd/pulse_audio_common: add context helper functions
lavd/pulse_audio_common: rename variables and enums
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Peter Ross [Thu, 17 Apr 2014 11:01:08 +0000 (21:01 +1000)]
DSD Stream File (DSF) demuxer
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Lukasz Marek [Wed, 16 Apr 2014 18:16:20 +0000 (20:16 +0200)]
lavd/pulse_audio_enc: implement pause messages
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Lukasz Marek [Tue, 15 Apr 2014 20:07:09 +0000 (22:07 +0200)]
lavd/pulse_audio_enc: implement volume messages
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Lukasz Marek [Tue, 15 Apr 2014 20:06:17 +0000 (22:06 +0200)]
lavd/avdevice: add volume messages
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Lukasz Marek [Fri, 11 Apr 2014 00:05:49 +0000 (02:05 +0200)]
lavd/pulse_audio_enc: add buffer fullness messages
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Lukasz Marek [Sun, 6 Apr 2014 21:12:44 +0000 (23:12 +0200)]
lavd/pulse_audio_enc: add nonblocking mode
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Lukasz Marek [Sun, 6 Apr 2014 21:11:46 +0000 (23:11 +0200)]
lavd/pulse_audio_enc: replace simple API with async API
Async API allows to use full capabilites of PulseAudio.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Lukasz Marek [Thu, 17 Apr 2014 23:10:20 +0000 (01:10 +0200)]
lavd/pulse_audio_enc: cosmetics
Lukasz Marek [Wed, 16 Apr 2014 13:23:46 +0000 (15:23 +0200)]
lavd/pulse_audio_common: add context helper functions
Functions allow to connect and disconnect from server.
Helpfull to implement utility functions with nested loops.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Lukasz Marek [Wed, 16 Apr 2014 13:24:33 +0000 (15:24 +0200)]
lavd/pulse_audio_common: rename variables and enums
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Michael Niedermayer [Thu, 17 Apr 2014 23:16:27 +0000 (01:16 +0200)]
avformat/replaygain: fix mixed declaration and statement
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 17 Apr 2014 23:01:38 +0000 (01:01 +0200)]
ffmpeg: fix mixed merged & split side data with the stream->packet hack
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 17 Apr 2014 21:51:45 +0000 (23:51 +0200)]
Merge commit '
32d05934abc7427bb90380a4c1ab20a15fd7d821 '
* commit '
32d05934abc7427bb90380a4c1ab20a15fd7d821 ':
mp3dec: decode more data from Info header
Conflicts:
libavformat/mp3dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 17 Apr 2014 20:38:51 +0000 (22:38 +0200)]
Merge commit '
0983d48111f578e17e8c1967d25ce593fce62b63 '
* commit '
0983d48111f578e17e8c1967d25ce593fce62b63 ':
crc: add ANSI CRC16 LE
Conflicts:
doc/APIchanges
libavutil/crc.c
libavutil/crc.h
libavutil/version.h
tests/ref/fate/crc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 17 Apr 2014 20:07:45 +0000 (22:07 +0200)]
Merge commit '
fbd8e042107ec63e0ddf155588c59dcb76007641 '
* commit '
fbd8e042107ec63e0ddf155588c59dcb76007641 ':
mp3dec: move XING/Info and VBRI parsing into their own functions
Conflicts:
libavformat/mp3dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 17 Apr 2014 19:45:39 +0000 (21:45 +0200)]
Merge commit '
ae43c10e36197000de2f3cc99ea35727ce98a796 '
* commit '
ae43c10e36197000de2f3cc99ea35727ce98a796 ':
replaygain: allow exporting already decoded replaygain values
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 17 Apr 2014 19:07:21 +0000 (21:07 +0200)]
Merge commit '
21d8f4da91673051ad7055cf63d989488a56368e '
* commit '
21d8f4da91673051ad7055cf63d989488a56368e ':
resample: remove an unneeded context variable
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Alessandro Ghedini [Sun, 13 Apr 2014 12:23:57 +0000 (14:23 +0200)]
mp3dec: decode more data from Info header
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Alessandro Ghedini [Mon, 14 Apr 2014 08:18:53 +0000 (10:18 +0200)]
crc: add ANSI CRC16 LE
This adds the reversed byte-order version of the ANSI CRC16.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Alessandro Ghedini [Sat, 12 Apr 2014 16:25:41 +0000 (18:25 +0200)]
mp3dec: move XING/Info and VBRI parsing into their own functions
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Alessandro Ghedini [Sat, 12 Apr 2014 16:25:40 +0000 (18:25 +0200)]
replaygain: allow exporting already decoded replaygain values
This adds a function to export raw replaygain values (i.e. in the (u)int32_t
form). It first checks whether AV_PKT_DATA_REPLAYGAIN side data is present, in
which case it does nothing.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Anton Khirnov [Sat, 22 Feb 2014 19:27:44 +0000 (20:27 +0100)]
resample: remove an unneeded context variable
Carl Eugen Hoyos [Thu, 17 Apr 2014 12:55:49 +0000 (14:55 +0200)]
Write sample_aspect_ratio to asf files.
Fixes ticket #3528.
Carl Eugen Hoyos [Thu, 17 Apr 2014 12:46:11 +0000 (14:46 +0200)]
Only insert the icpf atom in ProRes mkv packets if it isn't already present.
The patch allows to read broken mkv files containing ProRes as written by
the Haali muxer.
Fixes a part of ticket #3434.
James Almer [Fri, 11 Apr 2014 23:00:21 +0000 (20:00 -0300)]
x86/dsputil: use HADDD where applicable
Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Wed, 16 Apr 2014 23:15:35 +0000 (20:15 -0300)]
x86: move horizontal add macros to x86util
Also port relevant AVX2/XOP optimizations from x264 with permission
to relicense to LGPL from the corresponding authors
Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 17 Apr 2014 01:42:17 +0000 (03:42 +0200)]
Merge commit '
f1b239ec8b38474d31f3bfea1f0b1693774fa432 '
* commit '
f1b239ec8b38474d31f3bfea1f0b1693774fa432 ':
drawtext: Add fontconfig support
Conflicts:
configure
doc/filters.texi
libavfilter/vf_drawtext.c
See:
40b7a27bad8b8b35cb215bf4f4cba02a00d6f9e2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Sat, 12 Apr 2014 14:02:50 +0000 (16:02 +0200)]
drawtext: Add fontconfig support
Introduce the `font` option and make it optional to pass a fontfile.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Anh [Wed, 16 Apr 2014 18:00:17 +0000 (20:00 +0200)]
Fix compilation with --disable-everything --enable-muxer=avi --disable-network.
Fixes ticket #3568.
Michael Niedermayer [Wed, 16 Apr 2014 17:45:43 +0000 (19:45 +0200)]
avcodec/vble: use av_malloc_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 16 Apr 2014 17:44:23 +0000 (19:44 +0200)]
avfilter/vf_pixdesctest: use av_malloc_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 16 Apr 2014 17:41:41 +0000 (19:41 +0200)]
avformat/ico: use avmalloc(z)_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Wed, 16 Apr 2014 05:09:36 +0000 (02:09 -0300)]
x86/float_dsp: unroll loop in vector_fmac_scalar
~6% faster SSE2 performance. AVX/FMA3 are unaffected.
Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Matt Oliver [Tue, 15 Apr 2014 05:22:50 +0000 (15:22 +1000)]
Fix OpenGL device compilation with msvc gl.h
Reveiwed-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 16 Apr 2014 15:05:05 +0000 (17:05 +0200)]
avformat/mpegenc: try to improve the VBV buffer warning
Maybe fixes Ticket 3494
Part of the message suggested by: rogerdpack
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Wed, 16 Apr 2014 05:09:35 +0000 (02:09 -0300)]
x86/float_dsp: use SWAP in vector_fmac_scalar Win64
The mova is unnecessary
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 16 Apr 2014 00:06:37 +0000 (02:06 +0200)]
iavcodec/vc1dec: Fix missing {}
Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 16 Apr 2014 00:06:37 +0000 (02:06 +0200)]
avfilter/vf_deshake: fix loss of precission with odd resolutions
Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 16 Apr 2014 00:06:37 +0000 (02:06 +0200)]
avfilter/f_select: fix loss of precission in SAD calculation
Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 16 Apr 2014 00:55:13 +0000 (02:55 +0200)]
avcodec/g723_1: add assert to help static code analyzers
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 16 Apr 2014 00:06:37 +0000 (02:06 +0200)]
avcodec/diracdec: fix undefined behavior with shifts
Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 16 Apr 2014 00:06:37 +0000 (02:06 +0200)]
avformat/mpegts: Remove redundant check
Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 16 Apr 2014 00:06:37 +0000 (02:06 +0200)]
avcodec/fic: Fix return value check
Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 16 Apr 2014 00:06:37 +0000 (02:06 +0200)]
avcodec/dcadec: fix error message suppression code
Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 16 Apr 2014 00:06:37 +0000 (02:06 +0200)]
avcodec/mjpegen: Fix declared argument size
Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 15 Apr 2014 23:55:08 +0000 (01:55 +0200)]
swscale/swscale: fix srcStride/srcSlice typo
Fixes part of Ticket3466
Found by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 15 Apr 2014 23:37:38 +0000 (01:37 +0200)]
avformat/hnm: fix decoding of 256x256 video
Fixes Ticket3464
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 15 Apr 2014 21:59:43 +0000 (23:59 +0200)]
avformat/flacdec/flac_read_timestamp: free the correct packet
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 15 Apr 2014 21:53:31 +0000 (23:53 +0200)]
avformat/flacdec/flac_read_timestamp: dont modify AVStream state
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Peter Ross [Mon, 14 Apr 2014 08:22:32 +0000 (18:22 +1000)]
Direct Stream Digital (DSD) decoder
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Lars Hammarstrand [Tue, 16 Apr 2013 11:40:45 +0000 (13:40 +0200)]
configure: allow the gas-preprocessor to be called with an absolute path.
Allow the configure tool to call the gas-preprocessor with an absolute
path when included with either the "--as" or with a separate "--gas"
option. The patch is backward compatible and will not break any current
configuration setups.
The new behavior that comes with this option can be utilized in the
following ways:
Examples:
- Just as single option that includes both the gas-preprocessor.pl and
cc/as at the same time:
$ configure --as="/opt/app/build-tools/gas-preprocessor.pl \
/Applications/Xcode.app/.../Developer/usr/bin/gcc"
- Call gas-preprocessor with a separate option in conjunction with --as:
$ configure --gas="/opt/app/build-tools/gas-preprocessor.pl" \
--as="/Applications/Xcode.app/.../Developer/usr/bin/gcc"
- Address only the the gas-preprocessor and it will automatically fall
back to as or cc whichever that's defined:
$ configure --gas="/opt/app/build-tools/gas-preprocessor.pl"
- Or if no gas-preprocessor.pl is explicitly defined, it falls back to
the old behaivor.
Michael Niedermayer [Tue, 15 Apr 2014 14:00:36 +0000 (16:00 +0200)]
fate: force 128kb/sec for mp2 test
This fixes rounding differences between platforms
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 15 Apr 2014 13:09:57 +0000 (15:09 +0200)]
avcodec/mpegaudioenc_template: Fix integer overflow
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 15 Apr 2014 11:47:27 +0000 (13:47 +0200)]
avutil/frame: use av_malloc(z)_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 15 Apr 2014 11:45:26 +0000 (13:45 +0200)]
avformat/xmv: use av_malloc_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 15 Apr 2014 11:42:46 +0000 (13:42 +0200)]
avformat/mpegtsenc: use av_malloc_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 15 Apr 2014 11:35:46 +0000 (13:35 +0200)]
avformat/utils: fix typo
Found-by: reimar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 15 Apr 2014 04:35:35 +0000 (06:35 +0200)]
swresample/resample_template: try to consider src_size more exactly
This should avoid slight differences in the output causes by input
size alignment differences between archs
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 15 Apr 2014 02:08:32 +0000 (04:08 +0200)]
configure: fix arm osx build
Fixes Ticket3561
Solution suggested by jeremyhu
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 Apr 2014 17:20:17 +0000 (19:20 +0200)]
avformat: add av_format_inject_global_side_data(), and disable it by default
After this commit applications needs to call av_format_inject_global_side_data()
or handle AVStream side data by some other means if they want it not to be lost.
This fixes a API incompatibility with libav.
libav API does not allow the data to be passed through AVPackets
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 Apr 2014 23:22:52 +0000 (01:22 +0200)]
Merge commit '
a6ac4fcce44108f6f87278b8d12e890576f46a62 '
* commit '
a6ac4fcce44108f6f87278b8d12e890576f46a62 ':
vp78: Align the intra4x4_pred_mode_top array within VP8Macroblock
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 Apr 2014 21:46:15 +0000 (23:46 +0200)]
swscale/utils: fix changing src/dst range after initializing the context
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 Apr 2014 21:32:41 +0000 (23:32 +0200)]
swscale/utils: move handling of unscaled case to the end of init function
This way all context fields get initialized and can be used without needing to reinit the context
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 Apr 2014 21:18:21 +0000 (23:18 +0200)]
swscale: factor ff_sws_init_range_convert() out
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 Apr 2014 21:15:31 +0000 (23:15 +0200)]
swscale/swscale: clear to/from convert pointers when they used.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 Apr 2014 19:40:59 +0000 (21:40 +0200)]
avformat/img2dec: fix typo
Found-by: Reimar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Mon, 14 Apr 2014 17:43:04 +0000 (20:43 +0300)]
vp78: Align the intra4x4_pred_mode_top array within VP8Macroblock
This array is written using AV_WN32A, assuming alignment.
This hopefully fixes the failing vp7 fate test on sparc.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Mon, 14 Apr 2014 16:34:53 +0000 (18:34 +0200)]
Merge branch 'flac' of https://github.com/FernetMenta/FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 Apr 2014 15:29:27 +0000 (17:29 +0200)]
avcodec/x86/idct_sse2_xvid: fix non C99 inline function
Found-by: Matt Oliver <protogonoi@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Rainer Hochecker [Mon, 14 Apr 2014 14:06:55 +0000 (16:06 +0200)]
fate: update seeking reference for flac
Rainer Hochecker [Sat, 12 Apr 2014 16:13:32 +0000 (18:13 +0200)]
flac demuxer: improve seeking
Carl Eugen Hoyos [Mon, 14 Apr 2014 13:36:01 +0000 (15:36 +0200)]
Set the bitrate when decoding speex.
The bitrate of the first frame is used as bitrate for the speex stream.
Carl Eugen Hoyos [Mon, 14 Apr 2014 13:34:38 +0000 (15:34 +0200)]
Fix writing RGB 5:5:5 rawvideo into avi.
WMP expects bits per pixel to be set to 16 for RGB 5:5:5 rawvideo.
Michael Niedermayer [Mon, 14 Apr 2014 12:44:12 +0000 (14:44 +0200)]
Merge commit '
b3d905b702dcdda9e3ae2bcb7b5580ca77a96ab7 '
* commit '
b3d905b702dcdda9e3ae2bcb7b5580ca77a96ab7 ':
dcadec: Delete redundant init_get_bits call
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 Apr 2014 12:31:50 +0000 (14:31 +0200)]
Merge commit '
4d40e073dcdef335215c124d340ea156bc4bdf13 '
* commit '
4d40e073dcdef335215c124d340ea156bc4bdf13 ':
rtmpproto: Handle RTMP chunk size packets before the connect packet
Conflicts:
libavformat/rtmpproto.c
See:
36b9c27dae452e10b4fff3d10f836160a5b8fbbd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Stephan Soller [Sat, 12 Apr 2014 23:06:22 +0000 (01:06 +0200)]
avformat/rtmpproto: Added handling of an initial RTMP chunk size packet.
Fixes ticket #2911.
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 Apr 2014 12:12:41 +0000 (14:12 +0200)]
Merge commit '
6477139721f559b26eafd415e23e13ea2b0c27e1 '
* commit '
6477139721f559b26eafd415e23e13ea2b0c27e1 ':
rtmpproto: Make sure to pass on the error code if read_connect failed
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Niels Möller [Mon, 14 Apr 2014 08:26:57 +0000 (10:26 +0200)]
dcadec: Delete redundant init_get_bits call
No initialization is needed in dca_decode_frame, because the next
thing it does is calling dca_parse_frame_header, which takes care of
the needed initialization.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Stephan Soller [Sat, 12 Apr 2014 23:06:22 +0000 (01:06 +0200)]
rtmpproto: Handle RTMP chunk size packets before the connect packet
In all other cases where ff_rtmp_packet_read is used, the packet returned
is passed to rtmp_parse_result more or less immediately. In this single
case, the content of the packet was required to be a connect packet.
Some clients, e.g. Open Broadcaster Software, send a chunk size packet
before the connect packet. If the first packet is a chunk size packet,
handle it and read another one, requiring this to be a connect packet
instead.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Sun, 13 Apr 2014 10:44:03 +0000 (13:44 +0300)]
rtmpproto: Make sure to pass on the error code if read_connect failed
Previously, if read_connect failed, the ret variable was unmodified
and had the value 0, indicating success, which then was returned from
the rtmp_open function, even though it actually failed.
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Mon, 14 Apr 2014 00:23:04 +0000 (02:23 +0200)]
swresample/resample: simplify index/consumed calculation for the filter = 1 case
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 14 Apr 2014 00:20:33 +0000 (02:20 +0200)]
swresample/resample: Fix fractional part of index in the filter_size = 1 filters = 1 case
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 Apr 2014 22:53:05 +0000 (00:53 +0200)]
fate/libswresample: add tests with filter_size=1 phase_shift=0
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 Apr 2014 21:54:49 +0000 (23:54 +0200)]
avcodec/utils: prettify remap_deprecated_codec_id()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 Apr 2014 21:39:49 +0000 (23:39 +0200)]
avformat/network: use av_malloc_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 Apr 2014 21:31:12 +0000 (23:31 +0200)]
avcodec/psymodel: use av_malloc(z)_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 Apr 2014 21:28:57 +0000 (23:28 +0200)]
avcodec/fft-test: use av_malloc_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 Apr 2014 18:03:24 +0000 (20:03 +0200)]
avformat/mp3enc: drop redundant and uninitialized variable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 Apr 2014 16:27:05 +0000 (18:27 +0200)]
avformat/utils: reinject global side data on seeks
This fixes ffplay replaygain with seeking
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 Apr 2014 16:02:42 +0000 (18:02 +0200)]
avformat/utils: factorize if()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 Apr 2014 15:57:43 +0000 (17:57 +0200)]
avformat/utils: Inject global side data into first packet.
This fixes replaygain handling in ffplay and probably other applications.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 12 Apr 2014 18:01:33 +0000 (20:01 +0200)]
avutil/avstring: do not lose ascii characters when decoding non utf-8 with av_utf8_decode()
Fixes Ticket3363
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 12 Apr 2014 18:13:13 +0000 (20:13 +0200)]
ffprobe: do not lose non ascii characters in non utf8 strings
Fixes Ticket3363
Using U+FFFD REPLACEMENT CHARACTER as suggested by nicolas
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Peter Ross [Sun, 13 Apr 2014 04:45:10 +0000 (14:45 +1000)]
avformat/iff: indent
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Peter Ross [Sun, 13 Apr 2014 04:44:58 +0000 (14:44 +1000)]
avformat/iff: remove unused code
bits_per_coded_sample and block_align are calculated again at end of if() block
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 Apr 2014 12:46:38 +0000 (14:46 +0200)]
Merge commit '
0f524b6c690962d7ebbd59ded74288e1e9b0f009 '
* commit '
0f524b6c690962d7ebbd59ded74288e1e9b0f009 ':
x86/synth_filter: remove the fma3 version ifdefs
See:
7d2116dd09d19d9aa08f9155a932d684c8d6a2f7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 Apr 2014 12:39:51 +0000 (14:39 +0200)]
Merge commit '
aaab192df24a90f4450285cfb73b395cf495b462 '
* commit '
aaab192df24a90f4450285cfb73b395cf495b462 ':
af_volume: implement replaygain clipping prevention
Conflicts:
doc/filters.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 Apr 2014 12:28:51 +0000 (14:28 +0200)]
Merge commit '
ac976ed91e323754e9a84509873ebdb437372797 '
* commit '
ac976ed91e323754e9a84509873ebdb437372797 ':
lavr: allocate the resampling buffer with a positive size
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 13 Apr 2014 12:12:46 +0000 (14:12 +0200)]
Merge commit '
13164e479f1c87829096c19003d2cc658ccc1fd4 '
* commit '
13164e479f1c87829096c19003d2cc658ccc1fd4 ':
FATE: add tests for more resampling modes
Merged-by: Michael Niedermayer <michaelni@gmx.at>