]>
git.sesse.net Git - ffmpeg/log
Andreas Cadhalpun [Sun, 16 Oct 2016 19:47:00 +0000 (21:47 +0200)]
matroskadec: fix NULL pointer dereference
The problem was introduced in commit
1273bc6 .
Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Rick Kern [Mon, 10 Oct 2016 13:23:50 +0000 (09:23 -0400)]
lavc/videotoolboxenc: Error log formatting.
Signed-off-by: Rick Kern <kernrj@gmail.com>
Rick Kern [Mon, 10 Oct 2016 13:21:48 +0000 (09:21 -0400)]
lavc/videotoolboxenc: Update a53cc handling
Handles insertion into existing SEI NAL unit, inserts emulation
prevention bytes.
Signed-off-by: Rick Kern <kernrj@gmail.com>
Rick Kern [Mon, 10 Oct 2016 13:13:39 +0000 (09:13 -0400)]
lavc/videotoolboxenc: flush/free frames on close
Prevents encode callback from running after codec is closed.
Fixes a crash when an error is returned.
Signed-off-by: Rick Kern <kernrj@gmail.com>
Aman Gupta [Thu, 8 Sep 2016 08:19:43 +0000 (17:19 +0900)]
lavc/videotoolboxenc: implement a53cc
Signed-off-by: Rick Kern <kernrj@gmail.com>
Hendrik Leppkes [Fri, 14 Oct 2016 11:48:22 +0000 (13:48 +0200)]
mov: move stsd finalization to an appropriate place
mov_finalize_stsd_codec parses stream information from the ALAC extradata,
so run it after the extradata processing is completed in mov_read_stsd.
Fixes playback of 96kHz ALAC streams muxed by qaac or the reference alac encoder.
Fixes trac ticket #5826
Muhammad Faiz [Sun, 16 Oct 2016 20:17:50 +0000 (03:17 +0700)]
avfilter/firequalizer: add scale option
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
Clément Bœsch [Sun, 16 Oct 2016 17:20:36 +0000 (19:20 +0200)]
ffmpeg: remove unused ist parameter in do_subtitle_out()
James Almer [Sun, 16 Oct 2016 13:13:45 +0000 (10:13 -0300)]
Partially revert "avformat/matroskadec: set aspect ratio only when DisplayWidth and DisplayHeight are in pixels"
The code works just fine regardless of unit, so only make sure DisplayUnit
is not "unknown".
Found-by: Nicolas George <george@nsup.org>
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 15 Oct 2016 14:20:38 +0000 (11:20 -0300)]
avcodec/utils: print Chroma Location string in verbose log level
It's container level information on some formats (Matroska, MXF, yuv4mpeg), so
it should be printed at higher log levels than debug.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 15 Oct 2016 18:02:26 +0000 (15:02 -0300)]
avformat/matroskaenc: write a DisplayUnit element when aspect ratio is unknown
We don't currently support values 1 (centimeters), 2 (inches) or 3 (DAR),
only the default value 0 (pixels) which doesn't need to be written.
The fate refs are updated as unknown SAR is now signaled in the output
files with the addition of the new element.
Reviewed-by: Carl Eugen Hoyos <ceffmpeg@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 15 Oct 2016 21:01:50 +0000 (18:01 -0300)]
avformat/matroskadec: set aspect ratio only when DisplayWidth and DisplayHeight are in pixels
A missing DisplayUnit element or one with the default value of 0 means
DisplayWidth and DisplayHeight should be interpreted as pixels.
The current code setting st->sample_aspect_ratio is wrong when DisplayUnit
is anything else.
Reviewed-by: Carl Eugen Hoyos <ceffmpeg@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
Muhammad Faiz [Sat, 15 Oct 2016 22:54:34 +0000 (05:54 +0700)]
doc/filters: document tukey window on firequalizer
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
Muhammad Faiz [Sat, 15 Oct 2016 22:50:47 +0000 (05:50 +0700)]
avfilter/firequalizer: add tukey window
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
Muhammad Faiz [Sat, 15 Oct 2016 22:48:36 +0000 (05:48 +0700)]
avfilter/firequalizer: change WFUNC_MIN/MAX to NB_WFUNC
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
Muhammad Faiz [Wed, 12 Oct 2016 23:00:24 +0000 (06:00 +0700)]
avfilter/showcqt: add csp option
from colorspace filter
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
Jean Caillé [Mon, 10 Oct 2016 10:00:00 +0000 (12:00 +0200)]
lavf/mov: support gopro firmware udta tag
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Thomas Turner [Thu, 13 Oct 2016 22:13:56 +0000 (15:13 -0700)]
avutil: Improved selftest coverage for libavutil/fifo.c
Tested functions: av_fifo_generic_peek(), av_fifo_grow()
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Fri, 14 Oct 2016 15:08:51 +0000 (17:08 +0200)]
avutil/audio_fifo: Use av_fifo_freep() and remove redundant if()
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Fri, 14 Oct 2016 15:05:25 +0000 (17:05 +0200)]
ffmpeg: Use av_fifo_freep() to avoid stale pointers
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
James Zern [Fri, 14 Oct 2016 07:33:50 +0000 (00:33 -0700)]
ffmpeg_cleanup: fix crash with unrecognized codec
since:
3e5e5bd Merge commit '
398f015f077c6a2406deffd9e37ff34b9c7bb3bc '
Signed-off-by: James Zern <jzern@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Andreas Cadhalpun [Thu, 13 Oct 2016 20:14:46 +0000 (22:14 +0200)]
libopenjpegenc: fix out-of-bounds reads when filling the edges
The calculation of width/height should round up, not round down to
prevent setting width or height to 0.
Also image->comps[compno].w is unsigned (at least in openjpeg2), so the
calculation could silently wrap around without the explicit cast to int.
Reviewed-by: Michael Bradshaw <mjbshaw@gmail.com>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Andreas Cadhalpun [Thu, 13 Oct 2016 19:16:35 +0000 (21:16 +0200)]
libopenjpegenc: stop reusing image data buffer for openjpeg 2
openjpeg 2 sets the data pointers of the image components to NULL,
causing segfaults if the image is reused.
Reviewed-by: Michael Bradshaw <mjbshaw@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Carl Eugen Hoyos [Tue, 4 Oct 2016 10:21:41 +0000 (12:21 +0200)]
configure: Enable pie for toolchain=hardened.
Marton Balint [Tue, 4 Oct 2016 22:32:48 +0000 (00:32 +0200)]
lavfi/sidedata: add filter for manipulating frame side data
This is a similar filter to f_metadata, only it works on side data. Since
adding side data from a user provided arbitrary binary string is unsafe,
because current code assumes that a side data of a certain kind has the proper
size, this filter only implements selection and deletion. Also, no value
matching support is implemented yet, because there is no uniform way to specify
a side data textually.
Signed-off-by: Marton Balint <cus@passwd.hu>
Andreas Cadhalpun [Tue, 11 Oct 2016 18:28:35 +0000 (20:28 +0200)]
configure: fix detection of libopenjpeg
Use check_lib2 to test the header together with the function. This is
necessary, because '-DOPJ_STATIC' changes what the included header does.
Also add '-DOPJ_STATIC' to CPPFLAGS, so that it isn't necessary to
hardcode this in libavcodec/libopenjpeg{dec,enc}.c.
Finally, check for non-static openjpeg 2.1, too.
Reviewed-by: Michael Bradshaw <mjbshaw@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Muhammad Faiz [Thu, 13 Oct 2016 01:43:50 +0000 (08:43 +0700)]
fate: add test for firequalizer filter
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
Stefano Sabatini [Thu, 13 Oct 2016 15:47:49 +0000 (17:47 +0200)]
doc/demuxers: restore alphabetical order
James Almer [Thu, 13 Oct 2016 17:22:07 +0000 (14:22 -0300)]
avformat/matroskadec: workaround the field_order bug in the Matroska muxer
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
Vicente Olivert Riera [Wed, 12 Oct 2016 15:09:40 +0000 (16:09 +0100)]
libavcodec/mips/h264dsp_msa.c: fix type in some function parameters
This fixes a build problem for MIPS architecture that looks like this:
libavcodec/mips/h264dsp_msa.c:2498:6: error: conflicting types for
‘ff_weight_h264_pixels16_8_msa’
void ff_weight_h264_pixels16_8_msa(uint8_t *src, int stride,
This bug was introduced by commit
bc26fe89275c267d169b468356c82ee59874407d :
avcodec/h264: Use ptrdiff_t for (bi)weight functions
That commit changed the data type of some function parameters in some
function definitions. However, the implementation of those functions in
libavcodec/mips/h264dsp_msa.c wasn't changed accordingly.
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Carl Eugen Hoyos [Thu, 13 Oct 2016 10:14:20 +0000 (12:14 +0200)]
lavf/riff: Support Verint NetDVR II ("VSM4") h263 video in asf.
James Almer [Wed, 12 Oct 2016 22:39:26 +0000 (19:39 -0300)]
avformat: bump minor version after the Matroska field order enum fix
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Wed, 12 Oct 2016 19:51:39 +0000 (16:51 -0300)]
avformat/matroska: fix MatroskaVideoFieldOrder enum values
The spec says
9: Interlaced with bottom field displayed first and top field stored first
14: Interlaced with top field displayed first and bottom field stored first
And avcodec.h states
AV_FIELD_TB, //< Top coded first, bottom displayed first
AV_FIELD_BT, //< Bottom coded first, top displayed first
Reviewed-by: Dave Rice <dave@dericed.com>
Signed-off-by: James Almer <jamrial@gmail.com>
Carl Eugen Hoyos [Wed, 5 Oct 2016 13:10:23 +0000 (15:10 +0200)]
configure: Use LDEXEFLAGS in check_ld().
Avoids detecting libraries that are not compatible with ldexeflags.
Timo Rothenpieler [Wed, 12 Oct 2016 18:51:43 +0000 (20:51 +0200)]
avcodec/nvenc: add support for forcing intra/idr frames
Philip Langdale [Sun, 9 Oct 2016 03:34:00 +0000 (20:34 -0700)]
crystalhd: Use mpeg4_unpack_bframes to avoid buggy crystalhd handling
The hardware handling of packed bframes was always questionable but
it used to ok with my workaround. Today, not so much. But today we
have a bsf to unpack the bframes, so let's just use that and be
done with it.
Philip Langdale [Sun, 18 Sep 2016 19:38:20 +0000 (12:38 -0700)]
crystalhd: Fix handling of PTS
With all the various refactorings that have happened over the years,
the current pts logic is very broken for non-trivial cases (ie: ones
where not every frame/field has a meaningful pts assocated with it).
Generally, we do not want to write AV_NOPTS_VALUE as the output
timestamp, regardless of anything else. It's better to pass zero
if there's no other information.
Additionally, interlaced content where the decoder returns each field
separately can result in the first field carrying the timestamp and
the second having AV_NOPTS_VALUE. It's clearly wrong to overwrite
the valid timestamp.
So, let's just never write AV_NOPTS_VALUE into an output frame.
Empirically, this fixed playback of interlaced mpeg2 and h.264 and
mpeg4-asp with packed b-frames in an avi container.
Carl Eugen Hoyos [Wed, 12 Oct 2016 10:34:48 +0000 (12:34 +0200)]
lavf/riffenc: Always write unexpected channel_mask.
Allows to write arbitrary channel masks also for 16bit 48kHz pcm.
Rostislav Pehlivanov [Sat, 8 Oct 2016 00:47:04 +0000 (01:47 +0100)]
aacenc: use the decoder's lcg PRNG
Using lfg was an overkill in this case where the random numbers
were only used for encoder descisions. Should increase result
uniformity between different FPUs and gives a slight speedup.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Matthieu Bouron [Thu, 6 Oct 2016 09:56:24 +0000 (11:56 +0200)]
lavc/mediacodecdec: rename dequeued_buffer_nb to output_buffer_count
Matthieu Bouron [Thu, 6 Oct 2016 09:53:13 +0000 (11:53 +0200)]
lavc/mediacodecdec: remove first output buffer timing debug log
James Almer [Tue, 11 Oct 2016 17:36:16 +0000 (14:36 -0300)]
avformat/matroskaenc: don't write a FlagInterlaced element if it would write the default value
The spec says:
"Mandatory elements with a default value may be left out of the file. In the absence
of a mandatory element, the element's default value is used."
Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Tue, 11 Oct 2016 01:05:48 +0000 (03:05 +0200)]
doc/developer: Mention mime type and patchwork in "Submitting patches"
Suggested-by: ronald
Reviewed-by: Steven Liu <lingjiujianke@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Marton Balint [Thu, 6 Oct 2016 21:43:03 +0000 (23:43 +0200)]
lavfi/metadata: fix metadata deletion if comparison returns false
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
Moritz Barsnick [Sun, 9 Oct 2016 18:51:57 +0000 (20:51 +0200)]
doc: fix various typos and grammar errors
Signed-off-by: Moritz Barsnick <barsnick@gmx.net>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Carl Eugen Hoyos [Tue, 11 Oct 2016 08:07:18 +0000 (10:07 +0200)]
lavf/matroskaenc: Always write V_QUICKTIME extradata.
Fixes ticket #5872.
Carl Eugen Hoyos [Tue, 11 Oct 2016 07:52:34 +0000 (09:52 +0200)]
lavf/aiffenc: Write extradata also for qcelp.
Fixes ticket #4009.
Carl Eugen Hoyos [Tue, 11 Oct 2016 07:49:35 +0000 (09:49 +0200)]
lavf/aiffdec: Default to full rate qcelp as QT does.
Fixes decoding of the output file from ticket #4009.
Carl Eugen Hoyos [Sat, 8 Oct 2016 09:23:41 +0000 (11:23 +0200)]
lavf/mxfenc: Do not print a useless error message.
The option d10_channelcount only exists for mxf_d10.
James Almer [Fri, 7 Oct 2016 05:46:22 +0000 (02:46 -0300)]
avformat/matroskaenc: fix targets for attachment tags
Attachment tags were being written targeting non-existent streams in the
output file.
Also filter filename and mimetype entries, as they are standard elements
in the Attachment master.
Signed-off-by: James Almer <jamrial@gmail.com>
Moritz Barsnick [Sun, 9 Oct 2016 01:49:15 +0000 (03:49 +0200)]
lavfi/pan: renormalize negative gain coefficients properly
The parser for the outdef will accept a negative value for the first
named channel's gain. As negative values effectively only invert the
phase of the signal, and not negate the level, the gains' absolute
values must be used to correctly accumulate the levels.
Signed-off-by: Moritz Barsnick <barsnick@gmx.net>
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Zhou Xiaoyong [Mon, 10 Oct 2016 08:07:20 +0000 (16:07 +0800)]
configure: loongson disable mipsfpu and mipsdsp optimizations
The optimizations of mipsdsp are not supported by all loongson cpu.
The optimizations of mipsfpu and mipsdspr2 maybe supported by 3A2000/3A3000/3A4000 but not tested yet.
Loongson only support mmi (loongSIMD) optimizations now.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Steve Lhomme [Wed, 5 Oct 2016 10:52:15 +0000 (12:52 +0200)]
avcodec/d3d11va: use the proper slice index
The slice index expected by D3D11VA is the one from the texture not from the
array or texture/slices.
In VLC the slices we provide the decoder don't start from 0 and thus pictures
appear in bogus order. With possible crashes and corruptions when using an
invalid index.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Mon, 10 Oct 2016 00:41:24 +0000 (02:41 +0200)]
avutil/hwcontext_vdpau: Fix warning: "GET_CALLBACK" redefined
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 9 Oct 2016 01:05:27 +0000 (03:05 +0200)]
avformat/movenc: Check frame rate in mov_write_uuidprof_tag()
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sun, 9 Oct 2016 00:42:57 +0000 (02:42 +0200)]
avformat/movenc: Switch mov_write_uuidprof_tag() to avg_frame_rate
Using the stream timebase simply overflows
Fix integer overflow in psp framerate computation
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sat, 8 Oct 2016 15:49:10 +0000 (17:49 +0200)]
avformat/utils: Update codec_id before using it in the parser init
Fixes assertion failure
Fixes: input.avi
Found-by: 连一汉 <lianyihan@360.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Muhammad Faiz [Sun, 9 Oct 2016 19:27:31 +0000 (02:27 +0700)]
avfilter/firequalizer: fix blackman window calculation
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
Moritz Barsnick [Sun, 9 Oct 2016 10:57:02 +0000 (12:57 +0200)]
cmdutils: fix typos
Signed-off-by: Moritz Barsnick <barsnick@gmx.net>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Moritz Barsnick [Sun, 9 Oct 2016 10:57:01 +0000 (12:57 +0200)]
lavf: fix typos
Signed-off-by: Moritz Barsnick <barsnick@gmx.net>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Moritz Barsnick [Sun, 9 Oct 2016 10:57:00 +0000 (12:57 +0200)]
lavfi: fix typos
Signed-off-by: Moritz Barsnick <barsnick@gmx.net>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Moritz Barsnick [Sun, 9 Oct 2016 10:56:59 +0000 (12:56 +0200)]
lavc: fix typos
Signed-off-by: Moritz Barsnick <barsnick@gmx.net>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Moritz Barsnick [Sun, 9 Oct 2016 10:56:58 +0000 (12:56 +0200)]
tools: fix grammar error
Signed-off-by: Moritz Barsnick <barsnick@gmx.net>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sat, 8 Oct 2016 22:32:08 +0000 (00:32 +0200)]
doc/examples/http_multiclient: Fix "doc/examples/http_multiclient.c:43:9: warning: passing argument 4 of av_opt_get from incompatible pointer type"
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Hendrik Leppkes [Sat, 8 Oct 2016 09:38:47 +0000 (11:38 +0200)]
Merge commit '
398f015f077c6a2406deffd9e37ff34b9c7bb3bc '
* commit '
398f015f077c6a2406deffd9e37ff34b9c7bb3bc ':
avconv: buffer the packets written while the muxer is not initialized
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
James Almer [Fri, 7 Oct 2016 05:32:10 +0000 (02:32 -0300)]
avformat/matroskaenc: fix Tags master on seekable output if there are tags after the last stream duration
The dynamic AVIOContext would get closed pointing to the wrong position
in the buffer.
This is a regression since
650e17d88b63b5aca6e0a43483e89e64b0f7d2dd .
Reviewed-by: Dave Rice <dave@dericed.com>
Signed-off-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Fri, 7 Oct 2016 14:05:09 +0000 (16:05 +0200)]
ffmpeg: Fix bitstream typo
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Hendrik Leppkes [Fri, 7 Oct 2016 13:44:39 +0000 (15:44 +0200)]
ffmpeg: explicitly write headers for files with no streams
Recent changes to ffmpeg.c tied output file init to stream init, which broke
stream-less files, specifically ffmetadata output.
Michael Niedermayer [Fri, 7 Oct 2016 12:01:20 +0000 (14:01 +0200)]
avformat/matroskaenc: Fix () error
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Hendrik Leppkes [Fri, 7 Oct 2016 12:39:00 +0000 (14:39 +0200)]
Merge commit '
1c169782cae6c5c430ff62e7d7272dc9d0e8d527 '
* commit '
1c169782cae6c5c430ff62e7d7272dc9d0e8d527 ':
avconv: explicitly postpone writing the header until all streams are initialized
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Fri, 7 Oct 2016 11:29:11 +0000 (13:29 +0200)]
Merge commit '
5b63b15663d31f50ce45d980b904a68795ad3f7a '
* commit '
5b63b15663d31f50ce45d980b904a68795ad3f7a ':
lavfi: set the link hwframes context before configuring the dst input
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Fri, 7 Oct 2016 11:28:53 +0000 (13:28 +0200)]
Merge commit '
0c9c4004ed57de210b4d83c7b39bbfb00b86b9af '
* commit '
0c9c4004ed57de210b4d83c7b39bbfb00b86b9af ':
omx: Don't return > 0 from omx_encode_frame
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Fri, 7 Oct 2016 11:23:49 +0000 (13:23 +0200)]
Merge commit '
31aa5335c390c83a6c3ea955b155067c36c4a2c4 '
* commit '
31aa5335c390c83a6c3ea955b155067c36c4a2c4 ':
libopenh264enc: Fix inconsistent whitespace
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Fri, 7 Oct 2016 11:23:38 +0000 (13:23 +0200)]
Merge commit '
4f98bb7b6d0323d9ecc3bebd6e24d46a3a374bad '
* commit '
4f98bb7b6d0323d9ecc3bebd6e24d46a3a374bad ':
msmpeg4: Remove commented-out debug logging code
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Fri, 7 Oct 2016 11:22:25 +0000 (13:22 +0200)]
Merge commit '
eedbeb4c2737f28844157fae4bd87ed42a61bb1d '
* commit '
eedbeb4c2737f28844157fae4bd87ed42a61bb1d ':
msmpeg4: Remove some broken, commented-out cruft
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Fri, 7 Oct 2016 11:21:51 +0000 (13:21 +0200)]
Merge commit '
3c84eaae9da0dc450ae99c65bb6b9865e3ba7fad '
* commit '
3c84eaae9da0dc450ae99c65bb6b9865e3ba7fad ':
h264: Eliminate unused but set variable
Noop, the variable doesn't exist in our code.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Fri, 7 Oct 2016 11:20:04 +0000 (13:20 +0200)]
Merge commit '
4dbfcd07570a9e45e9597561023adb6da26f27f6 '
* commit '
4dbfcd07570a9e45e9597561023adb6da26f27f6 ':
librtmp: Avoid an infiniloop setting connection arguments
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Fri, 7 Oct 2016 11:19:53 +0000 (13:19 +0200)]
Merge commit '
fe498ef5144d3712b887f44a0c5e654add99ead7 '
* commit '
fe498ef5144d3712b887f44a0c5e654add99ead7 ':
hwcontext_vaapi: Return all formats for constraints without config
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Fri, 7 Oct 2016 11:19:32 +0000 (13:19 +0200)]
Merge commit '
11b8030309ee93d79b3a6cd4b83bf00757db1598 '
* commit '
11b8030309ee93d79b3a6cd4b83bf00757db1598 ':
vaapi_encode: Fix fallback when input does not match any format
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Fri, 7 Oct 2016 11:19:06 +0000 (13:19 +0200)]
Merge commit '
8c3c7b8920033d61c7aa15a4465b759c84e5958f '
* commit '
8c3c7b8920033d61c7aa15a4465b759c84e5958f ':
dxva2_h264: Remove an unused variable
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Fri, 7 Oct 2016 11:18:05 +0000 (13:18 +0200)]
Merge commit '
dc7501e524dc3270335749302c7aa449973625f3 '
* commit '
dc7501e524dc3270335749302c7aa449973625f3 ':
checkasm: Issue emms after benchmarking functions
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Fri, 7 Oct 2016 11:16:36 +0000 (13:16 +0200)]
Merge commit '
beb62dac629603eb074a44c44389c230b5caac7c '
* commit '
beb62dac629603eb074a44c44389c230b5caac7c ':
Use AVFrame.pts instead of deprecated pkt_pts.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Fri, 7 Oct 2016 10:55:50 +0000 (12:55 +0200)]
Merge commit '
32c8359093d1ff4f45ed19518b449b3ac3769d27 '
* commit '
32c8359093d1ff4f45ed19518b449b3ac3769d27 ':
lavc: export the timestamps when decoding in AVFrame.pts
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Hendrik Leppkes [Sat, 1 Oct 2016 14:15:45 +0000 (16:15 +0200)]
ffmpeg: remove unused and errorneous AVFrame timestamp check
Decoders have previously not used AVFrame.pts, and with the upcoming
deprecation of pkt_pts (in favor of pts), this would lead to an errorneous
interpration of timestamps.
Rodger Combs [Thu, 8 Sep 2016 00:16:34 +0000 (19:16 -0500)]
tests: add -nostdin flag when calling ffmpeg
This fixes a long-standing issue where running FATE in parallel could result
in the terminal being left misconfigured, particularly if a test failed or
was canceled wtih ^C.
Rodger Combs [Thu, 8 Sep 2016 00:16:27 +0000 (19:16 -0500)]
ffmpeg: don't reconfigure terminal if we're not taking input from stdin
James Almer [Thu, 6 Oct 2016 21:17:04 +0000 (18:17 -0300)]
avformat/matroskaenc: add an option to disable writting CRC32 elements
Also add missing Changelog entry.
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 3 Oct 2016 22:29:28 +0000 (19:29 -0300)]
avformat/matroskaenc: write a CRC32 element on Info
Finishes implementing ticket #4347
Tested-by: Dave Rice <dave@dericed.com>
Tested-by: Jerome Martinez <jerome@mediaarea.net>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 3 Oct 2016 22:27:30 +0000 (19:27 -0300)]
avformat/matroskaenc: write a CRC32 element on Tags
Implements part of ticket #4347
Tested-by: Dave Rice <dave@dericed.com>
Tested-by: Jerome Martinez <jerome@mediaarea.net>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 3 Oct 2016 22:23:55 +0000 (19:23 -0300)]
avformat/matroskaenc: write a CRC32 element on Attachments
Implements part of ticket #4347
Tested-by: Dave Rice <dave@dericed.com>
Tested-by: Jerome Martinez <jerome@mediaarea.net>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 3 Oct 2016 22:20:53 +0000 (19:20 -0300)]
avformat/matroskaenc: write a CRC32 element on Chapters
Implements part of ticket #4347
Tested-by: Dave Rice <dave@dericed.com>
Tested-by: Jerome Martinez <jerome@mediaarea.net>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 3 Oct 2016 22:20:11 +0000 (19:20 -0300)]
avformat/matroskaenc: write a CRC32 element on Tracks
Implements part of ticket #4347
Tested-by: Dave Rice <dave@dericed.com>
Tested-by: Jerome Martinez <jerome@mediaarea.net>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 3 Oct 2016 22:15:24 +0000 (19:15 -0300)]
avformat/matroskaenc: write a CRC32 element on Cues
Implements part of ticket #4347
Tested-by: Dave Rice <dave@dericed.com>
Tested-by: Jerome Martinez <jerome@mediaarea.net>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 3 Oct 2016 21:59:42 +0000 (18:59 -0300)]
avformat/matroskaenc: write a CRC32 element on SeekHead
Implements part of ticket #4347
Tested-by: Dave Rice <dave@dericed.com>
Tested-by: Jerome Martinez <jerome@mediaarea.net>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 3 Oct 2016 02:46:19 +0000 (23:46 -0300)]
avformat/matroskaenc: write a CRC32 element on each Cluster
Implements part of ticket #4347
Tested-by: Dave Rice <dave@dericed.com>
Tested-by: Jerome Martinez <jerome@mediaarea.net>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Sun, 2 Oct 2016 17:37:11 +0000 (14:37 -0300)]
avformat/matroskaenc: always use a dynamic buffer when writting clusters
Tested-by: Dave Rice <dave@dericed.com>
Tested-by: Jerome Martinez <jerome@mediaarea.net>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Sun, 2 Oct 2016 17:14:51 +0000 (14:14 -0300)]
avformat/matroskaenc: print debug message with cluster offsets only if the output is seekable
Printing the dynamic buffer offset is useless.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 27 Sep 2016 22:43:08 +0000 (19:43 -0300)]
avformat/matroskadec: check for more reserved values on some Colour elements
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 27 Sep 2016 22:20:57 +0000 (19:20 -0300)]
avformat/matroskaenc: don't write an empty Colour master element
Signed-off-by: James Almer <jamrial@gmail.com>
Carl Eugen Hoyos [Thu, 6 Oct 2016 16:44:29 +0000 (18:44 +0200)]
configure: Also try -mstack-alignment for clang,
Fixes stack alignment on x86_32 FreeBSD.
Fixes ticket #5231.