]>
git.sesse.net Git - ffmpeg/log
Hendrik Leppkes [Mon, 2 Mar 2015 11:04:33 +0000 (12:04 +0100)]
dxva2_hevc: properly signal the num_delta_pocs from the SPS RPS
ucNumDeltaPocsOfRefRpsIdx needs to contain the flat value from the SPS RPS,
and not the final computed value from the slice header RPS, as this calculation
is done internally by the driver again.
Sample-Id: http://trailers.divx.com/hevc/Sintel_4k_27qp_24fps_1aud_9subs.mkvi
Michael Niedermayer [Mon, 3 Aug 2015 12:47:11 +0000 (14:47 +0200)]
avcodec/videotoolbox: Add missing AV_ prefix to CODEC_ID in comment
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Mon, 3 Aug 2015 12:46:24 +0000 (14:46 +0200)]
avcodec/videotoolbox: Fix bistream typo
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Mon, 3 Aug 2015 12:06:28 +0000 (14:06 +0200)]
avcodec/pcm: Better min_size for ff_alloc_packet2()
33318 -> 30601 decicycles
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Mon, 3 Aug 2015 11:20:41 +0000 (13:20 +0200)]
avcodec/libwebpenc_animencoder: Use ff_alloc_packet2()
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Mon, 3 Aug 2015 10:39:37 +0000 (12:39 +0200)]
avcodec/rawenc: Use ff_alloc_packet2()
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Sebastien Zwickert [Sat, 11 Jul 2015 11:23:21 +0000 (13:23 +0200)]
avcodec: add new Videotoolbox hwaccel.
Henrik Gramner [Sun, 2 Aug 2015 20:40:03 +0000 (22:40 +0200)]
x86inc: Various minor backports from x264
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Henrik Gramner [Sun, 2 Aug 2015 20:40:01 +0000 (22:40 +0200)]
x86inc: Disable vpbroadcastq workaround in newer yasm versions
The bug was fixed in 1.3.0, so only perform the workaround in earlier versions.
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 2 Aug 2015 23:22:27 +0000 (01:22 +0200)]
avcodec/aacdec: Fix integer overflow in argument to decode_audio_specific_config()
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Emanuel Czirai [Sun, 2 Aug 2015 22:58:46 +0000 (00:58 +0200)]
libavcodec/aacdec_template: Use init_get_bits8() in aac_decode_frame()
related to ticket4749
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 2 Aug 2015 21:02:12 +0000 (23:02 +0200)]
avcodec/cngenc: Use ff_alloc_packet2()
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 2 Aug 2015 18:58:31 +0000 (20:58 +0200)]
avcodec/libwebpenc: Use ff_alloc_packet2()
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 2 Aug 2015 18:57:39 +0000 (20:57 +0200)]
avcodec/v210enc: Use ff_alloc_packet2()
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 2 Aug 2015 18:36:24 +0000 (20:36 +0200)]
avcodec/aliaspixenc: Use ff_alloc_packet2()
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 2 Aug 2015 18:24:30 +0000 (20:24 +0200)]
avcodec/avuienc: Use ff_alloc_packet2()
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Rico Tzschichholz [Sun, 2 Aug 2015 16:11:03 +0000 (18:11 +0200)]
libshine: Fix faulty ff_alloc_packet2 usage
Paul B Mahol [Sun, 2 Aug 2015 16:41:12 +0000 (18:41 +0200)]
avcodec/xfaceenc: remove coded_frame usage
Paul B Mahol [Wed, 29 Jul 2015 17:04:28 +0000 (19:04 +0200)]
avfilter: add atadenoise
Paul B Mahol [Thu, 23 Jul 2015 07:07:26 +0000 (07:07 +0000)]
avfilter: add allyuv source filter
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sun, 2 Aug 2015 12:00:34 +0000 (14:00 +0200)]
avfilter/vf_deband: add mising slice thread flag
Paul B Mahol [Sun, 2 Aug 2015 11:31:45 +0000 (13:31 +0200)]
avfilter/f_drawgraph: stop making foreground color transparent
Hendrik Leppkes [Sat, 1 Aug 2015 09:11:14 +0000 (11:11 +0200)]
MAINTAINERS: Add myself as maintainer for dxva2 and Windows/MSVC
Michael Niedermayer [Sun, 2 Aug 2015 10:48:23 +0000 (12:48 +0200)]
avcodec/libutvideoenc: Remove coded_frame usage
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Hendrik Leppkes [Sun, 2 Aug 2015 10:40:53 +0000 (12:40 +0200)]
Merge commit '
14e558024642638085ae2bbeffc6087612e6a3f9 '
* commit '
14e558024642638085ae2bbeffc6087612e6a3f9 ':
opusdec: properly handle mismatching configurations in multichannel streams
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 2 Aug 2015 10:32:10 +0000 (12:32 +0200)]
Merge commit '
fdbc544d29176ba69d67dd879df4696f0a19052e '
* commit '
fdbc544d29176ba69d67dd879df4696f0a19052e ':
asfdec: prevent the memory leak while reading metadata
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 2 Aug 2015 10:31:39 +0000 (12:31 +0200)]
Merge commit '
ebaf571aca2dd6ce3caeeeec4210a3fccd47e7db '
* commit '
ebaf571aca2dd6ce3caeeeec4210a3fccd47e7db ':
x86: dct: Disable dct32_float_sse on x86-64
Conflicts:
libavcodec/x86/dct32.asm
libavcodec/x86/dct_init.c
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 2 Aug 2015 10:29:30 +0000 (12:29 +0200)]
Merge commit '
979cb55103fa8e8274806e496901203742c686d1 '
* commit '
979cb55103fa8e8274806e496901203742c686d1 ':
hevc: Split the sei parsing in 3 functions
Conflicts:
libavcodec/hevc_sei.c
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 2 Aug 2015 10:25:41 +0000 (12:25 +0200)]
Merge commit '
043f46f5741e1a5caedf55d788e1a72aae3b7605 '
* commit '
043f46f5741e1a5caedf55d788e1a72aae3b7605 ':
hevc: Use switch instead of if-nests in decode_nal_sei_message
Conflicts:
libavcodec/hevc_sei.c
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 2 Aug 2015 10:18:40 +0000 (12:18 +0200)]
Merge commit '
2cd841c0776535be56e4db67485fdd9509c9b9f4 '
* commit '
2cd841c0776535be56e4db67485fdd9509c9b9f4 ':
hevc: Use a proper enum for the SEI values
Conflicts:
libavcodec/hevc_sei.c
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Michael Niedermayer [Sun, 2 Aug 2015 09:26:58 +0000 (11:26 +0200)]
tests/fate/mp3: Fix fate-mp3-float-extra_overread on mips-qemu
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Hendrik Leppkes [Sun, 2 Aug 2015 08:51:53 +0000 (10:51 +0200)]
Merge commit '
80ea66112817c719b476de8f7d8d3b325f4c7dd1 '
* commit '
80ea66112817c719b476de8f7d8d3b325f4c7dd1 ':
avcodec: h264: Extract decoder methods
Conflicts:
libavcodec/h264_sei.c
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 2 Aug 2015 08:41:56 +0000 (10:41 +0200)]
Merge commit '
33dc1913ab7aaefc991b3e665d1d0b5d0b088672 '
* commit '
33dc1913ab7aaefc991b3e665d1d0b5d0b088672 ':
asfdec: remove improper assignement that caused wrong timestamps
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 2 Aug 2015 08:41:45 +0000 (10:41 +0200)]
Merge commit '
78491fe8cfed83d2aead95dafe26f0d3f999e961 '
* commit '
78491fe8cfed83d2aead95dafe26f0d3f999e961 ':
asfdec: do not export empty metadata
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 2 Aug 2015 08:41:26 +0000 (10:41 +0200)]
Merge commit '
3e853ff7acc56b180950ab39e7282f1b938c8784 '
* commit '
3e853ff7acc56b180950ab39e7282f1b938c8784 ':
des: extend av_des_init() doxy
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 2 Aug 2015 08:41:16 +0000 (10:41 +0200)]
Merge commit '
d9e8b47e3144262d6bc4681740411d4bdafad6ac '
* commit '
d9e8b47e3144262d6bc4681740411d4bdafad6ac ':
des: add av_des_alloc()
Conflicts:
libavutil/des.c
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 2 Aug 2015 08:39:37 +0000 (10:39 +0200)]
Merge commit '
5d8bea3bb2357bb304f8f771a4107039037c5549 '
* commit '
5d8bea3bb2357bb304f8f771a4107039037c5549 ':
xtea: add av_xtea_alloc()
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 2 Aug 2015 08:38:53 +0000 (10:38 +0200)]
Merge commit '
b469832de993dabbfe037bef59c68e90e82ebca5 '
* commit '
b469832de993dabbfe037bef59c68e90e82ebca5 ':
rc4: extend av_rc4_init() doxy
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 2 Aug 2015 08:38:33 +0000 (10:38 +0200)]
Merge commit '
ae365453c370c85f278bff7fbf9e20d9d335cb2a '
* commit '
ae365453c370c85f278bff7fbf9e20d9d335cb2a ':
rc4: add av_rc4_alloc()
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 2 Aug 2015 08:38:12 +0000 (10:38 +0200)]
Merge commit '
7a7df34c91e16ea8936f59524145a2cdd6b790f9 '
* commit '
7a7df34c91e16ea8936f59524145a2cdd6b790f9 ':
blowfish: add av_blowfish_alloc()
Conflicts:
doc/APIchanges
libavutil/version.h
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 2 Aug 2015 08:34:18 +0000 (10:34 +0200)]
Merge commit '
cd4d9df22738e6f147521ccb72c7930db6050914 '
* commit '
cd4d9df22738e6f147521ccb72c7930db6050914 ':
asfdec: free AVDictionaries properly when closing the demuxer
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sun, 2 Aug 2015 08:32:38 +0000 (10:32 +0200)]
Merge commit '
90e648c508fa6b97587ce62699a1449123f7d285 '
* commit '
90e648c508fa6b97587ce62699a1449123f7d285 ':
fate/mp3: use the f32le format as output
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Anton Khirnov [Mon, 27 Jul 2015 09:13:53 +0000 (11:13 +0200)]
opusdec: properly handle mismatching configurations in multichannel streams
The substreams can have different resampling delays, so an additional
level of buffering is needed to synchronize them.
Bug-Id: 876
Alexandra Hájková [Fri, 31 Jul 2015 07:53:40 +0000 (09:53 +0200)]
asfdec: prevent the memory leak while reading metadata
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Henrik Gramner [Sat, 1 Aug 2015 15:12:48 +0000 (17:12 +0200)]
x86: dct: Disable dct32_float_sse on x86-64
There is an SSE2 implementation so the SSE version is never used. The "SSE"
version also happens to contain SSE2 instructions on x86-64.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Michael Niedermayer [Sun, 2 Aug 2015 01:52:37 +0000 (03:52 +0200)]
avcodec/hevc_mp4toannexb_bsf: Remove ;;
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Vesselin Bontchev [Fri, 31 Jul 2015 10:16:08 +0000 (12:16 +0200)]
avformat/mov: fix regression in processing .aax files
Commit
0a551cbe introduced "activation_bytes" option, and not specifying
this option (while calling ffmpeg / ffprobe) causes the program to quit
early. Before this commit, ffprobe was capable of processing metadata in
.aax files.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Paul B Mahol [Sat, 1 Aug 2015 17:36:10 +0000 (19:36 +0200)]
avfilter/avf_showvolume: stop making output fully transparent
Rostislav Pehlivanov [Sat, 1 Aug 2015 16:40:30 +0000 (17:40 +0100)]
aacenc: add description to the 'aac_coder' option
This commit adds a short description to the aac_coder option of the
AAC encoder in order to be consistent with the other options.
Generally, right now, the 'FAAC' method works fine with speech and
low broadband spectrum audio. 'Fast' is just as the name suggests.
'ANMR' still needs work and 'Twoloop', the default, works well with
every type of audio.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Luca Barbato [Sat, 1 Aug 2015 13:39:44 +0000 (15:39 +0200)]
hevc: Split the sei parsing in 3 functions
Luca Barbato [Sat, 25 Jul 2015 13:26:29 +0000 (15:26 +0200)]
hevc: Use switch instead of if-nests in decode_nal_sei_message
Makes simpler to add support for more SEI types.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Luca Barbato [Sat, 25 Jul 2015 13:26:28 +0000 (15:26 +0200)]
hevc: Use a proper enum for the SEI values
And use the correct value for decoded_picture_hash.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
David Holm [Fri, 31 Jul 2015 19:06:13 +0000 (21:06 +0200)]
avcodec: h264: Extract decoder methods
Extract two methods from decode_registered_user_data in order to improve
code readability. Also make the constant holding the allocation size a
64-bit unsigned integer so that the size comparison against INT_MAX makes
sense.
Bug-Id: CID1312090
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Sat, 1 Aug 2015 01:25:04 +0000 (03:25 +0200)]
Revert "libavcodec/utils: av_get_exact_bits_per_sample fixed to return "1" for DSD codecs."
Requested-by: Ganesh Ajjanagadde <gajjanag@mit.edu> (original patch reviewer)
This reverts commit
293e25be615d43c9b611c4b04920ec0d245a7145 .
Michael Niedermayer [Sat, 1 Aug 2015 01:00:01 +0000 (03:00 +0200)]
Merge branch 'simple_http_server_api_implementation' of http://git.klaxa.eu/git/ffmpeg
Reviewed-by: Nicolas George <george@nsup.org>
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Rostislav Pehlivanov [Wed, 29 Jul 2015 04:44:24 +0000 (05:44 +0100)]
aacenc: remove redundant argument from coder functions
This commit removes a redundant argument from the functions in aaccoder.
The argument lambda was redundant as it was just a copy of s->lambda,
to which all functions have access to anyway. This cleans up the function
pointers a bit which is helpful as there are a lot of other search_for_*
functions under development and with them populated it gets messy.
Reviewed-by: Claudio Freire <klaussfreire@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Yu Xiaolei [Fri, 31 Jul 2015 22:42:15 +0000 (06:42 +0800)]
avcodec/libx264: expose nv21 input support
libx264 added support for NV21 input recently.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Ihar A. Tumashyk [Fri, 31 Jul 2015 22:52:17 +0000 (01:52 +0300)]
libavcodec/utils: av_get_exact_bits_per_sample fixed to return "1" for DSD codecs.
All DSD codes have 1 bit per sample.
https://en.wikipedia.org/wiki/Direct_Stream_Digital
Signed-off-by: Ihar A. Tumashyk <itumashyk@gmail.com>
Reviewed-by: Ganesh Ajjanagadde <gajjanag@mit.edu>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Stephan Holljes [Sat, 25 Jul 2015 00:07:15 +0000 (02:07 +0200)]
doc/example: Add http multi-client example code
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
Stephan Holljes [Fri, 3 Jul 2015 00:38:20 +0000 (02:38 +0200)]
doc/protocols: document experimental mutli-client api
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
Stephan Holljes [Fri, 3 Jul 2015 00:28:56 +0000 (02:28 +0200)]
lavf/http: Implement server side network code.
add http_accept,
add http_handshake and move handshake logic there,
handle connection closing.
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
Stephan Holljes [Tue, 21 Jul 2015 04:11:10 +0000 (06:11 +0200)]
lavf/tcp: increase range for listen and call the underlying socket operations accordingly
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
Stephan Holljes [Tue, 21 Jul 2015 04:10:25 +0000 (06:10 +0200)]
lavf/tcp: add tcp_accept
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
Stephan Holljes [Fri, 3 Jul 2015 00:25:51 +0000 (02:25 +0200)]
lavf/avio: add avio_accept and avio_handshake
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
Stephan Holljes [Fri, 3 Jul 2015 00:24:18 +0000 (02:24 +0200)]
lavf/avio: add ffurl_accept and ffurl_handshake
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
Stephan Holljes [Fri, 3 Jul 2015 00:22:25 +0000 (02:22 +0200)]
lavf/network: split ff_listen_bind into ff_listen and ff_accept
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
Paul B Mahol [Fri, 31 Jul 2015 18:19:06 +0000 (20:19 +0200)]
MAINTAINERS: update my maintership
rogerdpack [Thu, 30 Jul 2015 21:55:19 +0000 (15:55 -0600)]
dshow: show more debug timestamp info
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Michael Niedermayer [Fri, 31 Jul 2015 13:54:38 +0000 (15:54 +0200)]
MAINTAINERS: Remove myself as leader
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Fri, 31 Jul 2015 09:56:22 +0000 (11:56 +0200)]
Merge commit '
a0797950527120c85263c910eb6ba08fddcfdcb3 '
* commit '
a0797950527120c85263c910eb6ba08fddcfdcb3 ':
fate/mp3: specify the number of output samples instead of filesize
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Alexandra Hájková [Mon, 27 Jul 2015 11:37:04 +0000 (13:37 +0200)]
asfdec: remove improper assignement that caused wrong timestamps
and remove unneeded variable
Sample-Id: https://samples.libav.org/asf-wmv/asf-code-53/movn018.asf
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Alexandra Hájková [Mon, 27 Jul 2015 17:42:15 +0000 (19:42 +0200)]
asfdec: do not export empty metadata
Signed-off-by: Anton Khirnov <anton@khirnov.net>
James Almer [Fri, 31 Jul 2015 07:01:06 +0000 (09:01 +0200)]
des: extend av_des_init() doxy
Signed-off-by: Anton Khirnov <anton@khirnov.net>
James Almer [Tue, 28 Jul 2015 19:57:49 +0000 (16:57 -0300)]
des: add av_des_alloc()
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
James Almer [Tue, 28 Jul 2015 19:57:48 +0000 (16:57 -0300)]
xtea: add av_xtea_alloc()
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
James Almer [Fri, 31 Jul 2015 07:01:06 +0000 (09:01 +0200)]
rc4: extend av_rc4_init() doxy
Signed-off-by: Anton Khirnov <anton@khirnov.net>
James Almer [Tue, 28 Jul 2015 19:57:47 +0000 (16:57 -0300)]
rc4: add av_rc4_alloc()
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
James Almer [Tue, 28 Jul 2015 19:57:46 +0000 (16:57 -0300)]
blowfish: add av_blowfish_alloc()
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Alexandra Hájková [Thu, 30 Jul 2015 17:59:25 +0000 (19:59 +0200)]
asfdec: free AVDictionaries properly when closing the demuxer
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Anton Khirnov [Mon, 27 Jul 2015 19:49:17 +0000 (21:49 +0200)]
fate/mp3: use the f32le format as output
Those tests test the float decoder, so it is preferable to dump the
decoder output directly instead of converting it to s16.
Anton Khirnov [Mon, 27 Jul 2015 19:43:22 +0000 (21:43 +0200)]
fate/mp3: specify the number of output samples instead of filesize
This is not dependent on the output format.
Ganesh Ajjanagadde [Fri, 31 Jul 2015 00:33:28 +0000 (20:33 -0400)]
avformat/wavdec: add extra sample count check for G.729 files
Can be used to fix Ticket4577
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
James Almer [Thu, 30 Jul 2015 22:28:02 +0000 (19:28 -0300)]
mips/hevcdsp: fix string concatenation on macros
Needed for old compilers like GCC 4.2
Tested by trac user brad. Fixes ticket #4745
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 25 Jul 2015 16:10:25 +0000 (13:10 -0300)]
x86/aacpsdsp: add SSE and SSE3 optimized functions
Between 1.5 and 2.5 times faster
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Thu, 30 Jul 2015 20:58:35 +0000 (22:58 +0200)]
Revert "ffmpeg: modify tty state when stderr is redirected"
faults in fate otherwise breaks the terminal.
To reproduce, add a abort() into wav_read_header()
run make fate-acodec-adpcm-ima_wav
This reverts commit
92e62f49cf7440a9e8998d284528e223c0948c97 .
Michael Niedermayer [Thu, 30 Jul 2015 17:57:58 +0000 (19:57 +0200)]
avcodec/r210enc: Drop coded_frame usage
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Thu, 30 Jul 2015 17:57:07 +0000 (19:57 +0200)]
avcodec/avuienc: Drop coded_frame usage
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Thu, 30 Jul 2015 16:37:34 +0000 (18:37 +0200)]
Merge commit '
764ec70149728be82304c163ccc4e280f1629201 '
* commit '
764ec70149728be82304c163ccc4e280f1629201 ':
rtsp: Only interpret $ as interleaved packet indicator at the start of replies
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Thu, 30 Jul 2015 16:28:43 +0000 (18:28 +0200)]
Merge commit '
6877537ff321136cf78ab03b8b91e6b6f218db5b '
* commit '
6877537ff321136cf78ab03b8b91e6b6f218db5b ':
hmac: add missing version bump and APIChanges entry
Conflicts:
libavutil/version.h
version.h is not changed as the code has been added 2 years ago in FFmpeg
See:
82ef67016ef731268ab7b8e91139bd5f16edc991
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Thu, 30 Jul 2015 15:42:19 +0000 (17:42 +0200)]
Merge commit '
0c73a5a53cc97f4291bbe9e1e68226edf6161744 '
* commit '
0c73a5a53cc97f4291bbe9e1e68226edf6161744 ':
hls: Save and forward avio options
Conflicts:
libavformat/hls.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Thu, 30 Jul 2015 14:23:09 +0000 (16:23 +0200)]
Merge commit '
5ae178539b91d25710b7bb322d156c31aea9f8bf '
* commit '
5ae178539b91d25710b7bb322d156c31aea9f8bf ':
http: Add the trailing endlines if they are missing
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Thu, 30 Jul 2015 14:14:23 +0000 (16:14 +0200)]
avcodec/y41penc: Drop coded_frame usage
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Thu, 30 Jul 2015 14:14:06 +0000 (16:14 +0200)]
avcodec/yuv4enc: drop coded_frame usage
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Martin Storsjö [Wed, 21 Jan 2015 12:05:43 +0000 (13:05 +0100)]
rtsp: Only interpret $ as interleaved packet indicator at the start of replies
Allow $ as character anywhere within normal RTSP replies - both
within the lines, and as the first character of RTSP header lines.
(The existing old comment indicated that an inline packet could
start at any line within a RTSP reply header, but that doesn't
sound valid to me, and I'm not sure if the existing code
handled that correctly either.)
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Thu, 30 Jul 2015 13:54:45 +0000 (15:54 +0200)]
avcodec/v308enc: Remove coded_frame usage
coded_frame is deprecated
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Thu, 30 Jul 2015 13:53:54 +0000 (15:53 +0200)]
avcodec/v408enc: remove coded_frame usage
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
James Almer [Thu, 30 Jul 2015 07:02:23 +0000 (04:02 -0300)]
hmac: add missing version bump and APIChanges entry
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
Ganesh Ajjanagadde [Mon, 27 Jul 2015 13:56:25 +0000 (09:56 -0400)]
ffmpeg: modify tty state when stderr is redirected
This fixes Ticket2964
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Thu, 30 Jul 2015 10:23:48 +0000 (12:23 +0200)]
Merge commit '
bf0cef5c3a114df452e5476167634dd8f51eb448 '
* commit '
bf0cef5c3a114df452e5476167634dd8f51eb448 ':
checkasm: Include io.h for isatty, if available
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Thu, 30 Jul 2015 10:14:13 +0000 (12:14 +0200)]
Merge commit '
9487ffd4c02b9e261562d43735490068c0df0d4b '
* commit '
9487ffd4c02b9e261562d43735490068c0df0d4b ':
rtmpproto: free hmac context properly
See:
6ce3d9fc4a70958680b93c6995cc87f34630a7e3
Merged-by: Michael Niedermayer <michael@niedermayer.cc>