Michael Niedermayer
dd4237f87d
Merge commit '5312818524484a995433b986a2a7a6602572d4db'
...
* commit '5312818524484a995433b986a2a7a6602572d4db':
atrac3plus: Make initialization dependant on channel count rather than channel map
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-31 14:53:06 +01:00
Michael Niedermayer
8eaa66212c
Merge commit '9ee9c679a7d444db223cf932e89cd39351f54f2d'
...
* commit '9ee9c679a7d444db223cf932e89cd39351f54f2d':
x86: videodsp: Fix a bug in a %if statement where we used '%%' instead of '&&'.
See: cd86eb265f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-31 14:36:35 +01:00
Michael Niedermayer
de17ccc774
Merge commit '51daafb02eaf96e0743a37ce95a7f5d02c1fa3c2'
...
* commit '51daafb02eaf96e0743a37ce95a7f5d02c1fa3c2':
x86: videodsp: Properly mark sse2 instructions in emulated_edge_mc as such.
Conflicts:
libavcodec/x86/videodsp_init.c
See: 1b3a7e1f42
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-31 14:30:30 +01:00
Janne Grunau
04ffd22030
fate: add xvid test for custom matrices
...
Test sample is made from the sample in Bug-Id: videolan/7411
2014-01-31 11:12:31 +01:00
Janne Grunau
7716dd9fbb
xvid: switch to xvid mmx idct as soon as possible
...
The idct implementation cannot be changed after the quantization matrices
are read since it use a different permutaion.
Bug-Id: videolan/7411
2014-01-31 11:09:11 +01:00
Janne Grunau
78987a88a8
lavf: include 60 fps in guessed standard frame rates
...
Due to what looks like an off-by-one error 60 * 12 * 1001 / 12 * 1001
is not tested as standard frame rate in avformat_find_stream_info().
2014-01-31 11:09:10 +01:00
Jan Ekström
5312818524
atrac3plus: Make initialization dependant on channel count rather than channel map
...
Makes it easier to recreate an AVCodecContext for ATRAC3+ decoding,
which is needed in multimedia frameworks, as well as in general cases
where demuxing and decoding are separate entities.
2014-01-31 11:09:10 +01:00
Michael Niedermayer
a85a718f26
doc/examples/decoding_encoding: Check all av_samples_get_buffer_size() returns
...
Fixed CID1135755
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-31 03:27:37 +01:00
Michael Niedermayer
c89f8f80cc
avformat/hdsenc: check mkdir() return code
...
This also returns failure if the mkdir failure is not due to an already existing
path.
Fixed CID1135749
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-31 03:08:49 +01:00
Michael Niedermayer
2e02d71237
ffmpeg: print data size too in statistic
...
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-31 01:36:47 +01:00
Stefano Sabatini
4111856545
doc/APIchanges: apply minor formatting fixes
2014-01-31 00:48:31 +01:00
James Darnley
9a6d91b6b6
Changelog: add entries relating to metadata_header_padding
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-30 20:37:07 +01:00
Michael Niedermayer
be7b76230f
ffmpeg: also count data streams bytes
...
Fixes wrong error message about empty output file
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-30 20:17:10 +01:00
Clément Bœsch
c5dd73b890
x86/vp9lpf: add ff_vp9_loop_filter_h_{48,84}_16_{sse2,ssse3,avx}().
...
5.40s → 5.30s overall decode time with -threads 1 on ped1080p.webm
(i7 920, ssse3)
2014-01-30 19:34:13 +01:00
Michael Niedermayer
6dc9d2cf47
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
doc: document correct option to list encoders
Conflicts:
doc/encoders.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-30 16:00:47 +01:00
Ronald S. Bultje
9ee9c679a7
x86: videodsp: Fix a bug in a %if statement where we used '%%' instead of '&&'.
...
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
2014-01-30 15:33:23 +01:00
Ronald S. Bultje
51daafb02e
x86: videodsp: Properly mark sse2 instructions in emulated_edge_mc as such.
...
Should fix crashes or corrupt output on pre-SSE2 CPUs when they were
using SSE2-code (e.g. AMD Athlon XP 2400+ or Intel Pentium III) in
hfix or hvar single-edge (left/right) extension functions.
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
2014-01-30 15:30:01 +01:00
Michael Niedermayer
d85284d4aa
Merge commit 'a17ab0e46a9fec7c31cc1be363828184c6ecebf7'
...
* commit 'a17ab0e46a9fec7c31cc1be363828184c6ecebf7':
doc: add decoders.texi
Conflicts:
doc/decoders.texi
doc/ffmpeg.texi
doc/ffplay.texi
See: 5e45f03420
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-30 15:19:51 +01:00
Michael Niedermayer
3c7195a969
Merge commit '23d461fe8714a20ee5e6929f22c61512fdda568e'
...
* commit '23d461fe8714a20ee5e6929f22c61512fdda568e':
ac3dec: Allow asymmetric application of DRC when drc_scale > 1
Conflicts:
libavcodec/ac3dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-30 14:55:03 +01:00
Carl Eugen Hoyos
3f35a31ee9
Add rangecoder to the sonic dependencies in configure.
...
Fixes compilation with --disable-everything --enable-decoder=sonic
and --disable-everything --enable-encoder=sonic.
2014-01-30 12:15:28 +01:00
Carl Eugen Hoyos
e1cb6dc59e
Warn the user if mjpeg cbr encoding with frame threading was requested.
2014-01-30 01:37:27 +01:00
Michael Niedermayer
1a5e8511d4
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
Force automatic thread_count to 1 for cbr mjpeg frame threading.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-30 00:55:29 +01:00
Michael Niedermayer
b80073c05f
avcodec/mjpegdec: use av_freep() instead of av_free()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-30 00:50:43 +01:00
Michael Niedermayer
ed56c021e7
avcodec/mjpegdec Fix potential memleak of stereo3D at the end in case of decoding failure
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-30 00:25:04 +01:00
Carl Eugen Hoyos
cfc36666f6
Force automatic thread_count to 1 for cbr mjpeg frame threading.
...
Constant bit rate mjpeg encoding fails for threads > 1 and frame threading.
2014-01-30 00:22:25 +01:00
Kirill Gavrilov
e9e7e68516
mjpegdec: parse JPS extension and save relevant stereo3d information
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-30 00:17:02 +01:00
Michael Niedermayer
72afa381b3
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
avformat: utils: Refactor duplicated PRINT macro
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-29 23:40:51 +01:00
John Stebbins
64ba831da9
doc: document correct option to list encoders
2014-01-29 23:27:37 +01:00
John Stebbins
a17ab0e46a
doc: add decoders.texi
...
Only documents ac3 decoder options at this point.
2014-01-29 23:27:18 +01:00
John Stebbins
23d461fe87
ac3dec: Allow asymmetric application of DRC when drc_scale > 1
...
Amplification of quiet sounds is enhanced.
Inspired by gbooker's A52Decoder.
2014-01-29 23:26:25 +01:00
Michael Niedermayer
fbafd64acc
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
mpeg: Drop unused parameters from ff_draw_horiz_band()
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-29 17:05:51 +01:00
Diego Biurrun
d67cfdeb53
avformat: utils: Refactor duplicated PRINT macro
2014-01-29 17:04:35 +01:00
Diego Biurrun
54b2ce7418
mpeg: Drop unused parameters from ff_draw_horiz_band()
2014-01-29 16:37:23 +01:00
Carl Eugen Hoyos
cfe282ec80
Remove now unneeded Makefile dependency for the wtv muxer.
2014-01-29 09:59:45 +01:00
Michael Niedermayer
29986885ef
avformat/mpegts: Continue parsing PMTs until at least 2 streams are found or 100kb are reached
...
This (ugly) hack fixes Ticket3348
If someone has an idea on how to fix this nicer, that would be very welcome
but the stream contains several PMTs with just one of the 2 streams at the start
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-29 05:44:03 +01:00
Michael Niedermayer
ad61419bbf
avformat/mpegts: drop stray space
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-29 05:43:39 +01:00
Carl Eugen Hoyos
bf9a8d183d
Support writing E-AC3 in wav.
2014-01-29 00:48:50 +01:00
Carl Eugen Hoyos
862174ec83
Move GUID-related objects to riffenc.c and riff.c.
...
This simplifies the following eac3-in-wav patch.
2014-01-29 00:44:59 +01:00
Carl Eugen Hoyos
4151b9953e
Add elbg Makefile dependency to the cinepak encoder.
2014-01-28 22:39:45 +01:00
Michael Niedermayer
b50efe85ea
avfilter/vf_colormatrix: update output AVFrame colorspace
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-28 21:52:02 +01:00
Michael Niedermayer
3e41e747d6
avfilter/vf_colormatrix: Support using the source AVFrame colorspace if none is specified
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-28 21:52:00 +01:00
Mikael Finstad
5846d8a91e
avformat/hls: Fix cookies and user agent with encrypted HLS streams
...
Session data (cookies, user-agent) is not being sent on payload requests with
encrypted HLS streams This causes services like Akamai to give a 403 forbidden
when requesting the TS files, because they expect the same cookies
and user-agent on all requests
2014-01-28 18:50:58 +01:00
Lukasz Marek
406cb21b63
doc/general: update device and protocol status
...
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-28 17:58:22 +01:00
Lukasz Marek
9ff2cc685b
MAINTAINERS: add myself as opengl_enc.c maintainer
...
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-28 15:30:49 +01:00
Lukasz Marek
4115cd0e76
doc/APIchanges: add avdevice_*_control_message functions
...
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-28 15:30:45 +01:00
Michael Niedermayer
bb7a711156
avcodec/huffyuvenc: frame multi-threading support
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-28 14:51:42 +01:00
James Almer
644c32ea4b
x86/vp9lpf: add ff_vp9_loop_filter_[vh]_88_16_sse2()
...
Similar gains as the ssse3 version once again
Signed-off-by: James Almer <jamrial@gmail.com>
2014-01-28 09:30:55 +01:00
Clément Bœsch
222c46c531
x86/vp9lpf: add ff_vp9_loop_filter_[vh]_88_16_{ssse3,avx}.
...
9680 decicycles in loop_filter_v_88_16_c, 4193765 runs, 539 skips
9233 decicycles in loop_filter_h_88_16_c, 4193751 runs, 553 skips
1929 decicycles in ff_vp9_loop_filter_v_88_16_ssse3, 4194118 runs, 186 skips
2738 decicycles in ff_vp9_loop_filter_h_88_16_ssse3, 4193861 runs, 443 skips
5.978 → 5.417 overall decode time on ped1080p.webm (-threads 1)
Adding SSE2 support should be relatively trivial (just a matter of
changing the pshufb [mask_mix] with something else), patch welcome.
2014-01-28 07:36:38 +01:00
Michael Niedermayer
2a9c50798b
avcodec/huffyuv: dont depend on bitstream_bpp having a specific value for version>2
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-28 00:27:57 +01:00
Michael Niedermayer
c94ed2a729
Merge remote-tracking branch 'lukaszmluki/master'
...
* lukaszmluki/master:
lavd: add opengl device
lavd: add avdevice_dev_to_app_control_message API
lavd: add avdevice_app_to_dev_control_message API
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-27 23:45:22 +01:00