]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Mon, 2 Feb 2015 21:30:56 +0000 (22:30 +0100)]
Revert "avformat/mpegtsenc: Change the service_type field to enum"
This isnt safe due to AVOption accessing this field as int
i just realized a moment after pushing
This reverts commit
0935453e84a17035f0c3544913e7ab7775839176 .
Michael Niedermayer [Mon, 2 Feb 2015 21:14:51 +0000 (22:14 +0100)]
avformat/mpegtsenc: Change the service_type field to enum
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
dhead666 [Mon, 2 Feb 2015 09:56:52 +0000 (11:56 +0200)]
libavformat/mpegtsenc: allow to set service_type in sdt
This adds an option to set the service type in mpegts as defined in ETSI 300 468.
I added what I believe are the most useful service types as pre defined values,
the others can be sent by using their hexdecimal form directly (e.g. -mpegts_service_type digital_radio, -mpegts_service_type 0x07).
I've been using this patch in order to pipe internet radio stream (originally as HLS/m3u8) from ffmpeg to tvheadend,
when the service type set right tvheadend recognize the mpegts stream as a radio channel.
The patch in its original form was written by linuxstb from freenode's hts channel which allowed me pushing it upstream.
This close issue 4118.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 2 Feb 2015 20:16:08 +0000 (21:16 +0100)]
Merge commit '
11e05533170485b593974cf90916425a0188e7bd '
* commit '
11e05533170485b593974cf90916425a0188e7bd ':
Ignore generated file tools/sidxindex.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 2 Feb 2015 19:43:13 +0000 (20:43 +0100)]
Merge commit '
3d5d46233cd81f78138a6d7418d480af04d3f6c8 '
* commit '
3d5d46233cd81f78138a6d7418d480af04d3f6c8 ':
opus: Factor out imdct15 into a standalone component
Conflicts:
configure
libavcodec/opus_celt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 2 Feb 2015 19:17:35 +0000 (20:17 +0100)]
Merge commit '
28df0151b6618226b05ee52e031af0b11ca531b0 '
* commit '
28df0151b6618226b05ee52e031af0b11ca531b0 ':
configure: Add a dependency on vc1_decoder from vc1_parser
See:
6ac3c8c6a0c6c69b84e408a9b494fcb26294b9ee
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Mon, 19 Jan 2015 10:12:23 +0000 (11:12 +0100)]
Ignore generated file tools/sidxindex.
Michael Niedermayer [Mon, 2 Feb 2015 18:56:44 +0000 (19:56 +0100)]
avcodec/hevc_filter: Fix indention
Found-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mickaël Raulet [Mon, 22 Dec 2014 13:55:54 +0000 (14:55 +0100)]
avcodec/hevc: adding support for monochrome sequences in hevc
cherry picked from commit
8e50557707d2ec11ccad657470b2e140f314348e
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Jean First [Mon, 2 Feb 2015 11:57:03 +0000 (12:57 +0100)]
lavc/libopenjpegenc: move opj_create_compress, opj_cio_open and opj_set_event_mgr to libopenjpeg_encode_frame
libopenjpegenc crashes with "pointer being freed was not allocated" when threading
is enabled with:
ffmpeg -i tests/vsynth1/01.pgm -vcodec libopenjpeg file.j2k
this appears to be a bug in libopenjpeg
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Jean First [Wed, 28 Jan 2015 15:41:24 +0000 (16:41 +0100)]
lavc/libopenjpegenc: factorize cinema parameters to it's own function
Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Sun, 1 Feb 2015 10:08:17 +0000 (11:08 +0100)]
opus: Factor out imdct15 into a standalone component
It will be reused by the AAC decoder.
Martin Storsjö [Sun, 1 Feb 2015 15:24:35 +0000 (17:24 +0200)]
configure: Add a dependency on vc1_decoder from vc1_parser
This fixes builds with vc1_parser enabled without vc1_decoder. All
the vc1_decoder object files were included in the vc1_parser line
in libavcodec/Makefile before, but architecture specific object files
for vc1_decoder were not.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Sun, 1 Feb 2015 18:33:23 +0000 (19:33 +0100)]
avcodec/wavpackenc: remove unneeded L suffixes
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Mon, 2 Feb 2015 09:08:22 +0000 (10:08 +0100)]
doc/ffprobe.xsd: drop build_date and build_time from programVersionType
Update schema after commit:
103e4c58633f210d7c3203cae121ba5b5123afa6
Andreas Cadhalpun [Sun, 1 Feb 2015 23:21:01 +0000 (00:21 +0100)]
doc/doxy-wrapper.sh: autodetect version
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andreas Cadhalpun [Sun, 1 Feb 2015 23:20:18 +0000 (00:20 +0100)]
stop embedding the build date
Theis makes the build binary reproducible.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Mon, 2 Feb 2015 03:00:53 +0000 (00:00 -0300)]
x86/hevcdsp: add missing vzeroupper in ff_hevc_sao_band_filter_48_*_avx2
Signed-off-by: James Almer <jamrial@gmail.com>
Ben Boeckel [Mon, 2 Feb 2015 01:00:02 +0000 (20:00 -0500)]
vorbis: parse out setup headers as well
Prevents an 'Invalid packet' message. Currently mid-stream setup packets
are ignored. Theoretically, they could, based on the specification, be used to
reinitialize the stream if parameters change, but I don't expect that to be
common (and no one seems to have asked for it).
Signed-off-by: Ben Boeckel <mathstuf@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Feb 2015 00:52:07 +0000 (01:52 +0100)]
ffplay: Fallback to dts if pts is unavailable in pkt_in_play_range calculation
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Mon, 2 Feb 2015 00:44:13 +0000 (21:44 -0300)]
x86/hevcdsp: add missing guards to ff_hevc_sao_band_filter_avx2
Signed-off-by: James Almer <jamrial@gmail.com>
James Darnley [Thu, 4 Sep 2014 22:13:36 +0000 (00:13 +0200)]
lavu/x86/x86inc: deprecate INIT_AVX
The same can be done with INIT_XMM avx
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Sun, 1 Feb 2015 18:34:41 +0000 (15:34 -0300)]
hevc/sao: use aligned copies
For band filter, source and destination are aligned (except for 16x16 ctbs),
and otherwise, they are most often aligned. Overall, the total width is also
too small for amortizing memcpy.
Timings (using an intrinsic version of edge filters):
B/32 B/64 E/32 E/64
Before: 32045 93952 38925 126896
After: 26772 83803 33942 117182
Christophe Gisquet [Sun, 1 Feb 2015 18:13:45 +0000 (15:13 -0300)]
x86: hevc/sao: aligned source buffers
Usefull for at least band filter, for which:
- Band filter call only:
32 64
Before: 16556 54015
After: 16497 52355
- Whole case:
32 64
Before: 37031 103008
After: 32045 93952
James Almer [Sun, 1 Feb 2015 18:01:36 +0000 (15:01 -0300)]
x86/hevc: add ff_hevc_sao_band_filter_{8,10,12}_{sse2,avx,avx2}
Original x86 intrinsics code and initial 8bit yasm port by Pierre-Edouard Lepere.
10/12bit yasm ports, refactoring and optimizations by James Almer
Benchmarks of BQTerrace_1920x1080_60_qp22.bin with an Intel Core i5-4200U
width 32
40338 decicycles in sao_band_filter_0_8, 2048 runs, 0 skips
8056 decicycles in ff_hevc_sao_band_filter_8_32_sse2, 2048 runs, 0 skips
7458 decicycles in ff_hevc_sao_band_filter_8_32_avx, 2048 runs, 0 skips
4504 decicycles in ff_hevc_sao_band_filter_8_32_avx2, 2048 runs, 0 skips
width 64
136046 decicycles in sao_band_filter_0_8, 16384 runs, 0 skips
28576 decicycles in ff_hevc_sao_band_filter_8_32_sse2, 16384 runs, 0 skips
26707 decicycles in ff_hevc_sao_band_filter_8_32_avx, 16384 runs, 0 skips
14387 decicycles in ff_hevc_sao_band_filter_8_32_avx2, 16384 runs, 0 skips
Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
Anton Mitrofanov [Thu, 28 Aug 2014 14:38:53 +0000 (18:38 +0400)]
x264asm: warn when inappropriate instruction used in function with specified cpuflags
Requested-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Requested-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Michael Niedermayer [Sun, 1 Feb 2015 19:45:00 +0000 (20:45 +0100)]
tests/utils: Remove unneeded L suffix
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Feb 2015 18:40:13 +0000 (19:40 +0100)]
avcodec/mpegvideo_enc: Fix number suffixes in rc_buffer_size calculation
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Feb 2015 18:39:22 +0000 (19:39 +0100)]
avcodec/h264_cabac: use int instead of long for mbb_xy
The mb address fits in int
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Feb 2015 18:36:36 +0000 (19:36 +0100)]
avformat/omadec: fix number suffix
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Feb 2015 18:36:13 +0000 (19:36 +0100)]
avformat/smacker: Fix number suffix
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Feb 2015 18:34:52 +0000 (19:34 +0100)]
avformat/matroskadec: Fix number suffixes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Feb 2015 18:29:20 +0000 (19:29 +0100)]
avcodec/dxtory: Use LL instead of L number suffix
This is probably unneeded and normal int would be fine, but its
safer to use LL and this isnt speed relevant
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Feb 2015 18:27:00 +0000 (19:27 +0100)]
swresample/dither: Cleanup number suffixes
The <<31 case needs LL
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Tue, 27 Jan 2015 19:46:57 +0000 (16:46 -0300)]
hevcdsp: replace the SAOParams struct parameter from sao_band_filter
Pass instead the two variables from the struct needed in the function.
This simplifies writing asm optimized versions of the function
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 27 Jan 2015 19:37:43 +0000 (16:37 -0300)]
hevcdsp: remove unused parameter from sao_band_filter
Signed-off-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Sun, 1 Feb 2015 18:19:25 +0000 (19:19 +0100)]
avformat/utils: Fix number suffixes in tb_unreliable()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Feb 2015 18:13:38 +0000 (19:13 +0100)]
avcodec/h261enc: Fix number suffix
Found-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Feb 2015 17:48:23 +0000 (18:48 +0100)]
avcodec/h261dec: Fix exported MVs for skipped MBs
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Feb 2015 14:41:05 +0000 (15:41 +0100)]
avcodec/nellymoserenc: replace assert by av_assert1()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Thu, 29 Jan 2015 14:15:21 +0000 (14:15 +0000)]
avfilter/vf_dctdnoiz: Use av_malloc_array()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Carl Eugen Hoyos [Sun, 1 Feb 2015 15:18:39 +0000 (16:18 +0100)]
Support YA16 in jpeg 2000.
Michael Niedermayer [Sun, 1 Feb 2015 13:35:15 +0000 (14:35 +0100)]
avformat/oggenc: Simplify by using OFFSET and PARAM
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Feb 2015 12:52:22 +0000 (13:52 +0100)]
Merge commit '
60392480181f24ebf3ab48d8ac3614705de90152 '
* commit '
60392480181f24ebf3ab48d8ac3614705de90152 ':
mem: fix pointer pointer aliasing violations
Conflicts:
libavutil/mem.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 1 Feb 2015 12:22:21 +0000 (13:22 +0100)]
Merge commit '
f726fc21ef76a8ba3445448066f7b2a687fbca16 '
* commit '
f726fc21ef76a8ba3445448066f7b2a687fbca16 ':
ogg: Provide an option to offset the serial number
Conflicts:
libavformat/oggenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sat, 31 Jan 2015 09:26:54 +0000 (09:26 +0000)]
avcodec/motion_est: remove unneeded #include, there are no assert() only av_assert*
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sat, 31 Jan 2015 09:13:37 +0000 (09:13 +0000)]
avcodec/put_bits: remove unneeded #include, there are no assert()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Rémi Denis-Courmont [Mon, 26 Jan 2015 19:17:31 +0000 (21:17 +0200)]
mem: fix pointer pointer aliasing violations
This uses explicit memory copying to read and write pointer to pointers
of arbitrary object types. This works provided that the architecture
uses the same representation for all pointer types (the previous code
made that assumption already anyway).
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Luca Barbato [Fri, 30 Jan 2015 16:29:22 +0000 (17:29 +0100)]
ogg: Provide an option to offset the serial number
The ogg serial number doubles as codec id and sequence
value for concatenated samples.
Christophe Gisquet [Fri, 30 Jan 2015 18:43:03 +0000 (19:43 +0100)]
dvenc: fix 2x4x8 (interlaced) weight table
Since the decoder has been fixed to output something similar to
other implementations, the encoder weight table needed this fix.
Reference PSNR values on a progressive sequence (from tiny_psnr)
from a chained encoding and decoding:
Full progressive: stddev: 0.74 PSNR: 50.69 MAXDIFF: 19
Before: stddev: 1.43 PSNR: 44.97 MAXDIFF: 17
This patch: stddev: 0.76 PSNR: 50.44 MAXDIFF: 14
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andreas Cadhalpun [Sat, 31 Jan 2015 20:11:38 +0000 (21:11 +0100)]
examples/demuxing_decoding: set stream_idx in open_codec_context only if no error occured
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 31 Jan 2015 20:14:08 +0000 (21:14 +0100)]
avcodec/motion_est: Set subcmp consistently for H261
Fixes Ticket3150
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 31 Jan 2015 18:49:57 +0000 (19:49 +0100)]
avcodec/h261enc: More specific return code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 31 Jan 2015 18:49:28 +0000 (19:49 +0100)]
avcodec/h261enc: Avoid casts, Simplify code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Zhang Rui [Sat, 31 Jan 2015 05:35:04 +0000 (13:35 +0800)]
avformat/cache: pass options to the underlying protocol via the url_open2
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 31 Jan 2015 13:29:11 +0000 (14:29 +0100)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
lavc/arm: Use the neon vertical chroma loop filter also for H.264 4:2:2.
lavc/aarch64: Do not use the neon horizontal chroma loop filter for H.264 4:2:2.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sat, 31 Jan 2015 12:56:47 +0000 (12:56 +0000)]
configure: remove mp_filter leftover
Pointed out by: ubitux
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Sat, 31 Jan 2015 12:39:45 +0000 (13:39 +0100)]
avfilter/avfilter: Remove CONFIG_MP_FILTER case
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sat, 31 Jan 2015 12:43:03 +0000 (12:43 +0000)]
avfilter: remove vf_mp.c
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Tue, 27 Jan 2015 11:21:50 +0000 (11:21 +0000)]
remove libmpcodecs
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Stefano Sabatini [Wed, 21 Jan 2015 19:10:45 +0000 (20:10 +0100)]
doc/indevs/libcdio: apply minor spell fixes, extend documentation
Stefano Sabatini [Fri, 30 Jan 2015 17:30:17 +0000 (18:30 +0100)]
lavd/libcdio: add more paranoia mode constants
Stefano Sabatini [Fri, 30 Jan 2015 17:16:07 +0000 (18:16 +0100)]
lavd/libcdio: apply minor fixes to options documentation
Carl Eugen Hoyos [Sat, 31 Jan 2015 09:05:24 +0000 (10:05 +0100)]
lavc/arm: Use the neon vertical chroma loop filter also for H.264 4:2:2.
Carl Eugen Hoyos [Sat, 31 Jan 2015 09:01:37 +0000 (10:01 +0100)]
lavc/aarch64: Do not use the neon horizontal chroma loop filter for H.264 4:2:2.
Paul B Mahol [Fri, 30 Jan 2015 11:26:25 +0000 (11:26 +0000)]
avformat/movenc: remove unneeded #include, there are no assert() only av_assert*
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 30 Jan 2015 11:25:18 +0000 (11:25 +0000)]
avformat/mov: remove unneeded #include, there are no assert()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 30 Jan 2015 11:23:27 +0000 (11:23 +0000)]
avformat/mux: remove unneeded #include, there are no assert() only av_assert*
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 30 Jan 2015 11:21:10 +0000 (11:21 +0000)]
avformat/asfenc: remove unneeded #include, there are no assert() only av_assert*
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 30 Jan 2015 11:19:39 +0000 (11:19 +0000)]
avformat/mpeg: remove unneeded #include, there are no assert() only av_assert*
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 30 Jan 2015 11:17:50 +0000 (11:17 +0000)]
avformat/utils: remove unneeded #include, there are no assert() only av_assert*
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 30 Jan 2015 10:52:19 +0000 (10:52 +0000)]
avcodec/vc1: remove unneeded #includes, there are no assert() only av_assert*
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 30 Jan 2015 10:51:10 +0000 (10:51 +0000)]
avcodec/svq1dec: remove unneeded #include, there are no assert()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Sat, 31 Jan 2015 03:57:50 +0000 (04:57 +0100)]
avcodec/h261enc: fix dquant encoding
Fixes Ticket4111
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 31 Jan 2015 01:37:19 +0000 (02:37 +0100)]
libavcodec/h264: replace assert() by av_assert0()
also remove the now unneeded #include <assert.h>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 31 Jan 2015 00:48:21 +0000 (01:48 +0100)]
avcodec/ratecontrol: replace asserts by av_asserts
Also remove the now unneeded #include <assert.h>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Fri, 30 Jan 2015 15:00:13 +0000 (15:00 +0000)]
avcodec/vp3: use init_get_bits8()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Fri, 30 Jan 2015 18:01:53 +0000 (19:01 +0100)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Respect horizontal differencing predictor for 16bit gray tiff images.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Thu, 29 Jan 2015 13:45:55 +0000 (13:45 +0000)]
lavfi: remove mp=softpulldown
It is supposed to work correctly with MEncoder only.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Fri, 30 Jan 2015 14:43:08 +0000 (15:43 +0100)]
avcodec/ppc/h264qpel_template: Change if DEBUG assert() to av_assert2()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 30 Jan 2015 14:40:48 +0000 (15:40 +0100)]
ppc/mpegvideo_altivec: Change assert to av_assert2()
And move it to where the variable is used
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Fri, 30 Jan 2015 10:58:19 +0000 (10:58 +0000)]
avcodec/videodsp_template: remove unneeded #include, there are no assert() only av_assert*
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 30 Jan 2015 10:42:44 +0000 (10:42 +0000)]
avcodec/qdm2: remove unneeded #include, there are no assert()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 30 Jan 2015 14:03:51 +0000 (14:03 +0000)]
ffmpeg: remove unused header
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 30 Jan 2015 11:44:00 +0000 (11:44 +0000)]
avformat/rtpdec_qdm2: change assert to av_assert0()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Christophe Gisquet [Fri, 30 Jan 2015 13:09:02 +0000 (13:09 +0000)]
ffmpeg: free_input_threads requires HAVE_PTHREADS
Hide behind that macro to avoid warning on systems with
!HAVE_PTHREADS.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Fri, 30 Jan 2015 13:12:55 +0000 (14:12 +0100)]
Respect horizontal differencing predictor for 16bit gray tiff images.
Fixes ticket #4291.
Stefano Sabatini [Fri, 30 Jan 2015 10:48:44 +0000 (11:48 +0100)]
doc/muxers/segment: document strftime option
It was added in commit
202947a0665ea523022afb0a6c50eed96bcd6b69 .
Paul B Mahol [Tue, 27 Jan 2015 18:09:32 +0000 (18:09 +0000)]
avformat/nut: support WavPack
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Thu, 29 Jan 2015 17:09:52 +0000 (17:09 +0000)]
avformat/nut: add GIF[0]
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Fri, 30 Jan 2015 01:29:38 +0000 (02:29 +0100)]
avcodec/aacdec: remove unneeded #include, theres no assert() in aacdec
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 30 Jan 2015 01:26:17 +0000 (02:26 +0100)]
avcodec/wma: remove unneeded #includes, there are no assert() only av_assert*
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 29 Jan 2015 23:42:48 +0000 (00:42 +0100)]
avcodec/hevc: Check for av_malloc failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 29 Jan 2015 23:42:03 +0000 (00:42 +0100)]
avcodec/hevc: Replace more mallocs by av_malloc_array()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anshul Maheshwari [Tue, 20 Jan 2015 10:32:29 +0000 (16:02 +0530)]
avcodec/ccaption_dec: Adding color and fonts for future use in screen
Signed-off-by: Anshul Maheshwari <er.anshul.maheshwari@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Lou Logan [Wed, 28 Jan 2015 18:35:31 +0000 (09:35 -0900)]
doc/indevs: add some XCB info to x11grab
Signed-off-by: Lou Logan <lou@lrcd.com>
Michael Niedermayer [Thu, 29 Jan 2015 21:43:36 +0000 (22:43 +0100)]
Merge commit '
22b985d59c007c4422aefe3ef3fca0aa0daafa9f '
* commit '
22b985d59c007c4422aefe3ef3fca0aa0daafa9f ':
hqdn3d: check memory allocations and propagate errors
Conflicts:
libavfilter/vf_hqdn3d.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 29 Jan 2015 21:34:54 +0000 (22:34 +0100)]
Merge commit '
70d246d5cc3d214da11f711d997d8cbd8c3a23d1 '
* commit '
70d246d5cc3d214da11f711d997d8cbd8c3a23d1 ':
flacenc: initialize sums matrix
Conflicts:
libavcodec/flacenc.c
No change, the table does not exist in FFmpeg in this form anymore
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 29 Jan 2015 21:02:03 +0000 (22:02 +0100)]
Merge commit '
c01ccccbb13f464e74bb8498a8c573a66c430ca0 '
* commit '
c01ccccbb13f464e74bb8498a8c573a66c430ca0 ':
ituh263dec: use macro instead of #if
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 29 Jan 2015 20:55:02 +0000 (21:55 +0100)]
Merge commit '
08fa34bf75942f66796d770ff42a3721b2e3d2d4 '
* commit '
08fa34bf75942f66796d770ff42a3721b2e3d2d4 ':
yuv4mpegdec: initialize field_order in yuv4_read_header()
Conflicts:
libavformat/yuv4mpegdec.c
See:
52a17972defa118705a4020a6d0bb3ad277df819
Merged-by: Michael Niedermayer <michaelni@gmx.at>