]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Fri, 20 Mar 2015 18:55:44 +0000 (19:55 +0100)]
Merge commit '
342fc46c69199b076b7c210f42208ce39a2bde1c '
* commit '
342fc46c69199b076b7c210f42208ce39a2bde1c ':
cmdutils: Add a stream specifier to map usable streams
Conflicts:
cmdutils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Thu, 19 Mar 2015 01:43:33 +0000 (22:43 -0300)]
libavutil: add bmi2 optimized av_mod_uintp2
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Wed, 18 Mar 2015 18:08:45 +0000 (15:08 -0300)]
libavutil: add av_mod_uintp2
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Fri, 20 Mar 2015 15:40:43 +0000 (16:40 +0100)]
avcodec/libvpxenc: Set min/max quantizer to 0 for lossless mode
Fixes Ticket4246
Reviewed-by: James Zern <jzern@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Mar 2015 18:12:57 +0000 (19:12 +0100)]
avfilter/vf_mcdeint: Change enums to int, which are accessed via AVOption as int
This fixes depending on implementation defined behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Mar 2015 18:11:58 +0000 (19:11 +0100)]
avfilter/vf_overlay: Change enums to int, which are accessed via AVOption as int
This fixes depending on implementation defined behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Mar 2015 18:09:38 +0000 (19:09 +0100)]
avfilter/vf_phase: Change enum to int, which is accessed via AVOption as int
This fixes depending on implementation defined behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Wed, 18 Mar 2015 12:40:12 +0000 (13:40 +0100)]
cmdutils: Add a stream specifier to map usable streams
It drops everything that cannot be used for re-encoding and/or
streamcopy.
Michael Niedermayer [Mon, 16 Mar 2015 14:31:57 +0000 (15:31 +0100)]
configure: Silence warnings about constant unsigned overflows in MSVC
unsigned overflows are well defined in C and used for example in crypto
and various other places.
None of the affected warnings currently shown points to an actual defect
untested
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
arwa arif [Fri, 13 Mar 2015 06:16:42 +0000 (11:46 +0530)]
lavfi/eq: rework expression evaluation
In particular, add support for t, pos, n, r parameters, and add an eval
mode option.
Also, partially reword option documentation.
With several major edit by Stefano Sabatini.
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Stefano Sabatini [Fri, 13 Mar 2015 15:45:08 +0000 (16:45 +0100)]
lavfi/eq: factorize code in process_command()
James Almer [Fri, 20 Mar 2015 05:37:54 +0000 (02:37 -0300)]
x86/xvididct: add some yasm guards
Should fix compilation on compilers with less-than-ideal dead code elimination
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Fri, 20 Mar 2015 05:34:46 +0000 (02:34 -0300)]
x86/xvididct: remove obsolete function prototypes
Signed-off-by: James Almer <jamrial@gmail.com>
Martin Vignali [Thu, 19 Mar 2015 21:11:41 +0000 (22:11 +0100)]
avcodec/dv: remove unused var dvquantareas
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Vignali [Thu, 19 Mar 2015 21:10:57 +0000 (22:10 +0100)]
avcodec/dv: remove unused var dv100qstep
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Vignali [Thu, 19 Mar 2015 21:09:05 +0000 (22:09 +0100)]
avfilter/vf_pp7: remove unused var
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Fri, 20 Mar 2015 00:09:42 +0000 (21:09 -0300)]
avcodec/libdcadec: add missing version bump and changelog entry
Kacper Michajłow [Fri, 20 Mar 2015 00:58:25 +0000 (01:58 +0100)]
avcodec: Fix libdcadec include dir
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Mar 2015 00:45:26 +0000 (01:45 +0100)]
Merge commit '
30e6abd1a8cc4fd5daf2e23ad2e768862c39e975 '
* commit '
30e6abd1a8cc4fd5daf2e23ad2e768862c39e975 ':
webp: ensure that each transform is only used once
See:
c089e720c1b753790c746a13053636d7facf6bf0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Mar 2015 00:10:06 +0000 (01:10 +0100)]
Merge commit '
cf18e777aed9f73011c7ab7cbab8003189d4b9d8 '
* commit '
cf18e777aed9f73011c7ab7cbab8003189d4b9d8 ':
movenc: write the display transform matrix
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Hendrik Leppkes [Thu, 19 Mar 2015 22:56:22 +0000 (23:56 +0100)]
avcodec: add libdcadec decoder
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Hendrik Leppkes [Thu, 19 Mar 2015 22:45:39 +0000 (23:45 +0100)]
avcodec: add profile define for DTS Express
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Mar 2015 22:56:31 +0000 (23:56 +0100)]
avcodec/dnxhddec: reset cur_field for non interlaced frames
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Mar 2015 22:33:36 +0000 (23:33 +0100)]
avcodec/dnxhddec: Reset is_444 if format is not 444
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Mar 2015 22:28:39 +0000 (23:28 +0100)]
avcodec/dnxhddec: Check that the frame is interlaced before using cur_field
Fixes Ticket4227
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andreas Cadhalpun [Thu, 5 Mar 2015 21:48:28 +0000 (22:48 +0100)]
webp: ensure that each transform is only used once
According to the WebP Lossless Bitstream Specification
"each transform is allowed to be used only once".
If a transform is more than once this can lead to memory
corruption.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Anton Khirnov [Thu, 12 Mar 2015 22:14:08 +0000 (23:14 +0100)]
movenc: write the display transform matrix
Michael Niedermayer [Thu, 19 Mar 2015 15:40:12 +0000 (16:40 +0100)]
avformat/avienc: Expand master ODML index when its end is reached
Fixes 256Gb limit
Fixes Ticket4225
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Mar 2015 15:37:16 +0000 (16:37 +0100)]
avformat/avienc: Fix wrongly placed comment
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Mar 2015 15:36:29 +0000 (16:36 +0100)]
avformat/avidec: also print frame_num in debug output
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Mar 2015 02:28:08 +0000 (03:28 +0100)]
avformat/avienc: factor out update_odml_entry()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Mar 2015 02:02:42 +0000 (03:02 +0100)]
avformat/avienc: factor write_odml_master() out
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Mar 2015 13:00:32 +0000 (14:00 +0100)]
Merge commit '
30a041887f89cd97c372ad6a516da6e012f2c88b '
* commit '
30a041887f89cd97c372ad6a516da6e012f2c88b ':
ismindex: Calculate the pts duration of trun atoms, not the dts duration
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Mar 2015 12:38:17 +0000 (13:38 +0100)]
Merge commit '
67a2912307c3c08f2725ccae162cfe3426b80184 '
* commit '
67a2912307c3c08f2725ccae162cfe3426b80184 ':
movenc: Don't assume that fragment durations in pts is equal to duration in dts
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Mar 2015 12:26:44 +0000 (13:26 +0100)]
Merge commit '
5c337353a2546416631a87de4881850d99141c39 '
* commit '
5c337353a2546416631a87de4881850d99141c39 ':
movenc: Move sidx edit list timestamp adjustment into a block
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Mar 2015 11:47:15 +0000 (12:47 +0100)]
Merge commit '
eee13d653953083553cceadbbedf6222ef78a006 '
* commit '
eee13d653953083553cceadbbedf6222ef78a006 ':
movenc: Only adjust the cts offset at the start of fragments if necessary
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Mar 2015 11:38:47 +0000 (12:38 +0100)]
Merge commit '
5cf892d6946b19a87bcd00d6b76ce81f45960fdb '
* commit '
5cf892d6946b19a87bcd00d6b76ce81f45960fdb ':
movenc: Write pts timestamps in tfxd, instead of dts timestamps
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Mar 2015 11:29:48 +0000 (12:29 +0100)]
Merge commit '
b81b0cc22b22413760423e239ea644c9afdbfa2d '
* commit '
b81b0cc22b22413760423e239ea644c9afdbfa2d ':
movenc: Set the last packet duration based on the next packet when autoflushing
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Mar 2015 11:18:02 +0000 (12:18 +0100)]
Merge commit '
3041183677bda0a431b36e96a2c76617abaa8183 '
* commit '
3041183677bda0a431b36e96a2c76617abaa8183 ':
dashenc: Heuristically fill in the duration of packets that need it
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Mar 2015 10:24:00 +0000 (11:24 +0100)]
Merge commit '
2889c5e16711770437f380f1bead5f72c6a0b17a '
* commit '
2889c5e16711770437f380f1bead5f72c6a0b17a ':
movenc: Heuristically set the duration of the last sample in a fragment if not set
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Mar 2015 10:12:52 +0000 (11:12 +0100)]
Merge commit '
8dc72eeaf647736c287b59a3856a11904bedd58b '
* commit '
8dc72eeaf647736c287b59a3856a11904bedd58b ':
udp: Fix crashes after adding AVOptions
See:
aefed6ca87971a9d277157c92fef4cdd42c5c1e2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Sun, 15 Mar 2015 22:18:37 +0000 (00:18 +0200)]
ismindex: Calculate the pts duration of trun atoms, not the dts duration
Since the duration is compared to the tfra durations/intervals which
are expressed in pts, calculate that here as well.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Sun, 15 Mar 2015 21:57:06 +0000 (23:57 +0200)]
movenc: Don't assume that fragment durations in pts is equal to duration in dts
For strict CFR, they should be pretty much equal, but if the stream
is VFR, there can be a sometimes significant difference.
Calculate the pts duration separately, used in sidx atoms and for
tfrf/tfxd boxes in smooth streaming ismv files.
Also make sure to reduce the duration of sidx entries according to
edit lists.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Mon, 16 Mar 2015 13:08:49 +0000 (15:08 +0200)]
movenc: Move sidx edit list timestamp adjustment into a block
When reading these values from track->frag_info, the same adjustment
has already been done.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Sun, 15 Mar 2015 21:40:06 +0000 (23:40 +0200)]
movenc: Only adjust the cts offset at the start of fragments if necessary
Adjusting it is only necessary when a sidx/tfrf/tfxd atom already has
been written for the previous fragment (since the sidx/tfrf/tfxd atoms
include the duration between the first pts of the previous fragment, to
the first pts of the new fragment).
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Mon, 16 Mar 2015 11:02:59 +0000 (13:02 +0200)]
movenc: Write pts timestamps in tfxd, instead of dts timestamps
This matches what we write in tfra and tfrf since
9cbf70fa0e .
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Mon, 9 Mar 2015 09:47:54 +0000 (11:47 +0200)]
movenc: Set the last packet duration based on the next packet when autoflushing
When automatically flushing fragments based on set conditions
(fragmentation on keyframes, after some interval or byte size),
we already have the next packet for one stream - use this for setting
the duration of the last packet in the flushed fragment correctly.
This avoids having to adjust the timestamp of the first packet in
the new fragment since the last duration was unknown.
Unfortunately, this only works for automatic flushing (not for
caller-triggered flushing, like in the dash muxer), and only for the
one single track that triggered the flushing. The duration of the
last sample in all other tracks still is dependent on AVPacket
duration (or heuristics).
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Fri, 6 Mar 2015 20:30:31 +0000 (22:30 +0200)]
dashenc: Heuristically fill in the duration of packets that need it
This avoids that the mp4 muxer does a similar heuristic, adjusting
the timestamps in a way that the dash muxer doesn't know the actual
timestamps written to the file in the end. By making sure that the
mp4 muxer internal heuristic isn't applied, we know the exact
timestamps written to file, so that the timestamps in manifest match
the files.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Fri, 6 Mar 2015 13:45:50 +0000 (15:45 +0200)]
movenc: Heuristically set the duration of the last sample in a fragment if not set
Even if this is a guess, it is way better than writing a zero duration
of the last sample in a fragment (because if the duration is zero,
the first sample of the next fragment will have the same timestamp
as the last sample in the previous one).
Since we normally don't require libavformat muxer users to set
the duration field in AVPacket, we probably can't strictly require
it here either, so don't log this as a strict warning, only as info.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Thu, 19 Mar 2015 07:28:25 +0000 (09:28 +0200)]
udp: Fix crashes after adding AVOptions
Add a missing AVClass member, check whether localaddr is null.
(Previously, localaddr was always a local stack buffer, while it
now also can be an avoption string which can be null.)
This fixes crashes when not passing any localaddr parameter, since
66028b7ba .
Signed-off-by: Martin Storsjö <martin@martin.st>
Andreas Cadhalpun [Wed, 18 Mar 2015 20:57:58 +0000 (21:57 +0100)]
mxfenc: don't try to write footer without header
This fixes a crash, when trying to mux h264 into mxf_opatom.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Previous version reviewed-by: tomas.hardin@codemill.se
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Mar 2015 00:44:14 +0000 (01:44 +0100)]
avformat/aiffdec: do not fail if header parser hits EOF
Based on patch by Martin Vignali <martin.vignali@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Mar 2015 00:39:47 +0000 (01:39 +0100)]
avformat/aiffdec: Stop header parsing once a non header packet is reached
Fix Ticket3530
Based-on debuging work by Martin Vignali <martin.vignali@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Wed, 18 Mar 2015 22:58:30 +0000 (23:58 +0100)]
avfilter/vf_colormatrix: fix yuv420p threading, second try
Now seems to work fine with different combinations of odd/even heights
and odd/even number of threads.
Michael Niedermayer [Wed, 18 Mar 2015 22:28:43 +0000 (23:28 +0100)]
avcodec/mjpegdec: Support
31111100 sampling
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 18 Mar 2015 22:05:22 +0000 (23:05 +0100)]
avcodec/mjpegdec: Change upscale_* to an array instead of a bitmask
This allows storing integer factors instead of just 0 and 1
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 18 Mar 2015 20:24:31 +0000 (21:24 +0100)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
lavf/mkv: Ignore ff_isom_write_hvcc() return value as the mov muxer does.
lavc/dts: Do not set bitrate for DTS-HD Master and High Resolution.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 18 Mar 2015 20:14:52 +0000 (21:14 +0100)]
Merge commit '
8692d74b7364b405d7939c0ed347e8a2815193a7 '
* commit '
8692d74b7364b405d7939c0ed347e8a2815193a7 ':
mov: Add option to keep exact packet sequence after seeking
Conflicts:
libavformat/isom.h
libavformat/mov.c
libavformat/version.h
See:
414d6547f33175b3f53eb3320aa13161a584a151
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Wed, 18 Mar 2015 19:35:26 +0000 (20:35 +0100)]
lavf/mkv: Ignore ff_isom_write_hvcc() return value as the mov muxer does.
This change allows remuxing hevc from mpeg-ts to Matroska.
Carl Eugen Hoyos [Wed, 18 Mar 2015 19:34:35 +0000 (20:34 +0100)]
lavc/dts: Do not set bitrate for DTS-HD Master and High Resolution.
Fixes ticket #4375.
Reviewed-by: Hendrik Leppkes
Micah Galizia [Tue, 17 Mar 2015 09:22:59 +0000 (20:22 +1100)]
avformat/http: replace cookies with updated values instead of appending forever
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Cowgill [Wed, 18 Mar 2015 13:02:59 +0000 (13:02 +0000)]
mips/float_dsp: fix vector_fmul_window_mips on mips64
Commit
dfa920807494 ("mips/float_dsp: fix a bug in vector_fmul_window_mips")
fixed vector_fmul_window_mips by unrolling the loop only 4 times, but also
removed the outer C loop and replaced it with assembly branches and pointer
arithmetic. When submitting my 64-bit porting patch I missed this new
assembly which also needed porting.
This patch fixes a bus error in the fate-float-dsp test when run on 64-bit
mips.
Signed-off-by: James Cowgill <james410@cowgill.org.uk>
Reviewed-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Derek Buitenhuis [Tue, 17 Mar 2015 14:19:31 +0000 (14:19 +0000)]
mov: Add option to keep exact packet sequence after seeking
The current behavior may produce a different sequence of packets
after seeking, compared to demuxing linearly from the beginning.
This is because the MOV demuxer seeks in each stream individually,
based on timestamp, which may set each stream at a slightly different
position than if the file would have been read sequentially.
This makes implementing certain operations, such as segmenting,
quite hard, and slower than need be.
Therefore, add an option which retains the same packet sequence
after seeking, as when a file is demuxed linearly.
Derek Buitenhuis [Mon, 16 Mar 2015 20:08:35 +0000 (20:08 +0000)]
mov: Add option to keep exact packet sequence after seeking
The current behavior may produce a different sequence of packets
after seeking, compared to demuxing linearly from the beginning.
This is because the MOV demuxer seeks in each stream individually,
based on timestamp, which may set each stream at a slightly different
position than if the file would have been read sequentially.
This makes implementing certain operations, such as segmenting,
quite hard, and slower than need be.
Therefore, add an option which retains the same packet sequence
after seeking, as when a file is demuxed linearly.
Michael Niedermayer [Wed, 18 Mar 2015 11:26:15 +0000 (12:26 +0100)]
avfilter/vf_lut3d: Change enum to int, which is accessed via AVOption as int
This fixes depending on implementation defined behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 18 Mar 2015 11:25:18 +0000 (12:25 +0100)]
avfilter/vf_il: Change enums to int, which are accessed via AVOption as int
This fixes depending on implementation defined behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 18 Mar 2015 11:23:39 +0000 (12:23 +0100)]
avfilter/vf_histogram: Change enum to int, which is accessed via AVOption as int
This fixes depending on implementation defined behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Wed, 24 Dec 2014 14:03:26 +0000 (15:03 +0100)]
lavfi: add showwavespic filter
This is a variant of showwaves. It is implemented as a different filter
so that the user is not allowed to use meaningless options which belong
to showwaves (such as rate).
Major edits done by Stefano Sabatini, from a patch by ubitux.
See thread:
From: Clément Bœsch <u@pkh.me>
To: ffmpeg-devel@ffmpeg.org
Date: Wed, 24 Dec 2014 15:03:26 +0100
Subject: [FFmpeg-devel] [PATCH] avfilter/showwaves: add single_pic option
Michael Niedermayer [Wed, 18 Mar 2015 00:18:40 +0000 (01:18 +0100)]
Replace PixelFormats which sneaked in over time or where forgotten by AVPixelFormats
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 18 Mar 2015 00:01:30 +0000 (01:01 +0100)]
Merge commit '
58a840e21577a2168843487a98cb2cea44b5a94a '
* commit '
58a840e21577a2168843487a98cb2cea44b5a94a ':
Replace a few leftover instances of enum PixelFormat with enum AVPixelFormat
See:
ac627b3d38d370027406c93c2dcaac0b1712a7d4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Tue, 17 Mar 2015 20:02:16 +0000 (17:02 -0300)]
avcodec/ac3dec_fixed: fix compilation when ac3dec is disabled
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Tue, 17 Mar 2015 21:39:01 +0000 (22:39 +0100)]
avcodec/aacsbr: Replace impossible condition by assert
bits can have a value of 0 or 1 they are never -1 or otherwise negative
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Tue, 17 Mar 2015 12:40:40 +0000 (14:40 +0200)]
Replace a few leftover instances of enum PixelFormat with enum AVPixelFormat
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Tue, 17 Mar 2015 20:58:16 +0000 (21:58 +0100)]
Merge commit '
6289706b35d1b030258bba54cc27bb6d2c04bc9b '
* commit '
6289706b35d1b030258bba54cc27bb6d2c04bc9b ':
fate: Move tdsc to the appropriate screen capture file
Conflicts:
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Mar 2015 20:43:39 +0000 (21:43 +0100)]
Merge commit '
423f5d50e499ab972f507115700c8f31ed8993e4 '
* commit '
423f5d50e499ab972f507115700c8f31ed8993e4 ':
mov: Fix little endian audio detection
Conflicts:
libavformat/mov.c
See:
d2549ba9df1a1aac8c0ae19bfca2c81e508ba02e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Mar 2015 20:26:11 +0000 (21:26 +0100)]
Merge commit '
cdce9e8025fff1dee2fd3d6bc28aebc0a330c5a0 '
* commit '
cdce9e8025fff1dee2fd3d6bc28aebc0a330c5a0 ':
aacsbr: Fix type for index variable
See:
a15adabdd32c8736c143fcbef36a0f4a75f772f0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Mar 2015 20:18:19 +0000 (21:18 +0100)]
Merge commit '
7c60c124c8dfaebfafa2b3c11b316db549617732 '
* commit '
7c60c124c8dfaebfafa2b3c11b316db549617732 ':
hqx: Drop unused offsets table
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Mar 2015 20:08:12 +0000 (21:08 +0100)]
Merge commit '
4326bc364b58e97fc3d89417054a6b7610179a00 '
* commit '
4326bc364b58e97fc3d89417054a6b7610179a00 ':
lavf: Do not list mov-only codecs in riff tags
Conflicts:
libavformat/Makefile
libavformat/avidec.c
See:
2e0b5f5c90a4bc1440703ba5e8bf7139ff42f367
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Mar 2015 19:55:47 +0000 (20:55 +0100)]
Michael Niedermayer [Tue, 17 Mar 2015 19:48:39 +0000 (20:48 +0100)]
Merge commit '
02d76141d68e38c80f9a205a56b9af10d74f0995 '
* commit '
02d76141d68e38c80f9a205a56b9af10d74f0995 ':
riff: Add 'tshd' FourCC for H.264
Conflicts:
libavformat/riff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Mar 2015 19:39:34 +0000 (20:39 +0100)]
Merge commit '
c0f504e947cc0a3c73770419bf7d1af98288fc59 '
* commit '
c0f504e947cc0a3c73770419bf7d1af98288fc59 ':
libx264: Allow full-range yuv422 and yuv444 pixel formats
See:
79209f5d6ca31c73260f1c5f5dbaa8395102d9f1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Mar 2015 19:32:46 +0000 (20:32 +0100)]
Merge commit '
c9ed48e80ef807ab0c1bb946ac8db5f34d83d9c9 '
* commit '
c9ed48e80ef807ab0c1bb946ac8db5f34d83d9c9 ':
dca: Read params->pancABIT0[param_index] only if part0 is set
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Mar 2015 19:14:48 +0000 (20:14 +0100)]
Merge commit '
48aef27f5232794e70ecef0d347b9f65e27a9bad '
* commit '
48aef27f5232794e70ecef0d347b9f65e27a9bad ':
x86: Put COPY3_IF_LT under HAVE_6REGS
Conflicts:
libavcodec/x86/mathops.h
See:
b38910c9790253b362839042a17e13252c1d4b90
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Tue, 17 Mar 2015 19:09:49 +0000 (20:09 +0100)]
avfilter/vf_colormatrix: make sure the number of threads is even for yuv420p
Fix crash with for example:
ffmpeg -f lavfi -i testsrc=568x320 -threads 3 -vf format=yuv420p,colormatrix=bt709:smpte170m -f null -
Michael Niedermayer [Tue, 17 Mar 2015 19:05:33 +0000 (20:05 +0100)]
Merge commit '
96dd04427fc46e5e25a5ac1f00753207e3aedb0c '
* commit '
96dd04427fc46e5e25a5ac1f00753207e3aedb0c ':
isom: Add support for TSCC2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Mar 2015 18:52:14 +0000 (19:52 +0100)]
Merge commit '
91894f27dce531c13d7e1be20253877f2e1e9e66 '
* commit '
91894f27dce531c13d7e1be20253877f2e1e9e66 ':
configure: Disable shift operator precedence warnings with MSVC
Conflicts:
configure
See:
9e208ce6dd94596b4185a93af4aab3dcd28eb5b7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Mar 2015 17:56:24 +0000 (18:56 +0100)]
avformat/mov: fix mis-detection of jpeg2000
Fixes demuxer choice for Ticket 2792
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Mar 2015 16:13:38 +0000 (17:13 +0100)]
avfilter/vf_histeq: Change enums to int, which are accessed via AVOption as int
This fixes depending on implementation defined behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Mar 2015 16:11:42 +0000 (17:11 +0100)]
avfilter/vf_fieldmatch: Change enums to int, which are accessed via AVOption as int
This fixes depending on implementation defined behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Mar 2015 15:52:10 +0000 (16:52 +0100)]
avfilter/vf_field: Change enum to int, which is accessed via AVOption as int
This fixes depending on implementation defined behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andreas Cadhalpun [Sat, 14 Mar 2015 16:47:53 +0000 (17:47 +0100)]
mxfenc: fix memleaks in mxf_write_footer
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Reviewed-by: tomas.hardin@codemill.se
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Tobias Rapp [Wed, 11 Mar 2015 10:22:04 +0000 (11:22 +0100)]
doc/protocols: Fixed missing example section marker
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Vittorio Giovara [Mon, 16 Mar 2015 13:09:50 +0000 (13:09 +0000)]
fate: Move tdsc to the appropriate screen capture file
Vittorio Giovara [Fri, 13 Mar 2015 19:45:14 +0000 (19:45 +0000)]
mov: Fix little endian audio detection
Set this field to TRUE if the audio component is to operate on
little-endian data, and FALSE otherwise.
However TRUE and FALSE are not defined. Since this flag is just a boolean,
interpret all values except for 0 as little endian.
Sample-Id: 64bit_FLOAT_Little_Endian.mov
Vittorio Giovara [Wed, 11 Mar 2015 19:25:00 +0000 (19:25 +0000)]
aacsbr: Fix type for index variable
Prevents unsigned overflow and variable truncation.
Bug-Id: CID 603186
Vittorio Giovara [Mon, 16 Mar 2015 13:40:35 +0000 (13:40 +0000)]
hqx: Drop unused offsets table
This is a leftover from the static to dynamic vlc table conversion.
Carl Eugen Hoyos [Mon, 16 Mar 2015 11:58:29 +0000 (11:58 +0000)]
lavf: Do not list mov-only codecs in riff tags
Instead check for all mov code-points when demuxing avi
and print a warning if a video codec is found like this.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Paul B Mahol [Mon, 16 Mar 2015 10:42:39 +0000 (10:42 +0000)]
isom: Add X-Com Radvision FourCC
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Vittorio Giovara [Mon, 16 Mar 2015 10:34:12 +0000 (10:34 +0000)]
riff: Add 'tshd' FourCC for H.264
Carl Eugen Hoyos [Tue, 17 Mar 2015 13:29:05 +0000 (13:29 +0000)]
libx264: Allow full-range yuv422 and yuv444 pixel formats
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>