]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Sun, 18 May 2014 12:53:41 +0000 (14:53 +0200)]
Merge commit '
79f2c426fde6e71c40b29504112d0528b85be623 '
* commit '
79f2c426fde6e71c40b29504112d0528b85be623 ':
dv: do not set codec timebase
Conflicts:
libavformat/dv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 18 May 2014 12:30:43 +0000 (14:30 +0200)]
Merge commit '
93afb6c98df876b15e3d911a9450ad55f92080ce '
* commit '
93afb6c98df876b15e3d911a9450ad55f92080ce ':
avconv: set output avg_frame_rate when known
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 18 May 2014 12:20:09 +0000 (14:20 +0200)]
Merge commit '
7a5f4f6853047eea74a6443d73f4d74d52b2799f '
* commit '
7a5f4f6853047eea74a6443d73f4d74d52b2799f ':
lavf: extend avg_frame_rate documentation.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 18 May 2014 12:14:33 +0000 (14:14 +0200)]
Merge commit '
c3311d472a7528c67f76d0d061704ae70a99b32e '
* commit '
c3311d472a7528c67f76d0d061704ae70a99b32e ':
avienc: sanitize variable naming in write_header()
Conflicts:
libavformat/avienc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 18 May 2014 12:09:41 +0000 (14:09 +0200)]
Merge commit '
ab3fdaa7131e2fd8e33006daea25a282724c01f0 '
* commit '
ab3fdaa7131e2fd8e33006daea25a282724c01f0 ':
yop: only set extradata size after it has been successfully allocated
Conflicts:
libavformat/yop.c
See:
a807c68253b02cce8b9fbc87d7857c31d531a1ee
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 18 May 2014 12:02:31 +0000 (14:02 +0200)]
Merge commit '
b513bf6f69e26e724de6d5dca642c3582dcd0517 '
* commit '
b513bf6f69e26e724de6d5dca642c3582dcd0517 ':
yuv4mpegdec: do not set coded_frame properties
Conflicts:
libavformat/yuv4mpegdec.c
See:
b45a3e167f497d82effbf8ada453ea47b0ee21da
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 18 May 2014 11:36:32 +0000 (13:36 +0200)]
Merge commit '
e4dc1000d7bbbcb5b45cf9849fc5315f19578e37 '
* commit '
e4dc1000d7bbbcb5b45cf9849fc5315f19578e37 ':
yuv4mpeg: split the demuxer and muxer into separate files
Conflicts:
libavformat/yuv4mpegdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 18 May 2014 11:24:55 +0000 (13:24 +0200)]
Merge commit '
3ef6c5264b2590781b4ed556443ff49709dd45fb '
* commit '
3ef6c5264b2590781b4ed556443ff49709dd45fb ':
a64: check that extradata exists before reading from it
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 18 May 2014 11:16:58 +0000 (13:16 +0200)]
Merge commit '
b136564909adec2043be4c94ade08b67ad443124 '
* commit '
b136564909adec2043be4c94ade08b67ad443124 ':
a64: remove unneeded struct qualifier
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 18 May 2014 11:09:42 +0000 (13:09 +0200)]
Merge commit '
d256ed78ffe202a4dcc8d625becffc716bfa3977 '
* commit '
d256ed78ffe202a4dcc8d625becffc716bfa3977 ':
4xm: allocate extradata properly.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 18 May 2014 11:00:50 +0000 (13:00 +0200)]
Merge commit '
fd056029f45a9f6d213d9fce8165632042511d4f '
* commit '
fd056029f45a9f6d213d9fce8165632042511d4f ':
lavc: add avcodec_free_context().
Conflicts:
doc/APIchanges
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 18 May 2014 10:46:28 +0000 (12:46 +0200)]
Merge commit '
e1b66778b6ee82a192b5895e23c4e135f7269326 '
* commit '
e1b66778b6ee82a192b5895e23c4e135f7269326 ':
lavc: remove the locking code in avcodec_close()
Conflicts:
libavcodec/utils.c
Note, if someone knows of a external codec lib/API, hwaccel or other that requires
locking on its close/free side, please contact ffmpeg-devel.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Sun, 17 Nov 2013 17:42:02 +0000 (18:42 +0100)]
dv: do not set codec timebase
It is not supposed to be set from outside of libavcodec.
Set average framerate instead.
Anton Khirnov [Sun, 11 May 2014 16:00:48 +0000 (18:00 +0200)]
avconv: set output avg_frame_rate when known
Anton Khirnov [Sun, 11 May 2014 15:58:05 +0000 (17:58 +0200)]
lavf: extend avg_frame_rate documentation.
Anton Khirnov [Sun, 11 May 2014 08:07:35 +0000 (10:07 +0200)]
avienc: sanitize variable naming in write_header()
Do not call an AVCodecContext 'stream', that is highly confusing.
Also, add a local variable for the current AVStream in the loop over all
streams.
Anton Khirnov [Sat, 3 May 2014 08:48:03 +0000 (10:48 +0200)]
yop: only set extradata size after it has been successfully allocated
Do not leave a non-zero extradata_size set on failure
Anton Khirnov [Sat, 3 May 2014 09:08:25 +0000 (11:08 +0200)]
yuv4mpegdec: do not set coded_frame properties
coded_frame is not meant to be changed from outside of lavc, and is not
used for decoding.
Set AVCodecContext.field_order instead.
Anton Khirnov [Sat, 3 May 2014 09:04:50 +0000 (11:04 +0200)]
yuv4mpeg: split the demuxer and muxer into separate files
Anton Khirnov [Sat, 3 May 2014 08:44:17 +0000 (10:44 +0200)]
a64: check that extradata exists before reading from it
Anton Khirnov [Sat, 3 May 2014 08:43:27 +0000 (10:43 +0200)]
a64: remove unneeded struct qualifier
Anton Khirnov [Sat, 3 May 2014 06:50:41 +0000 (08:50 +0200)]
4xm: allocate extradata properly.
Pad it with the required amount of zeros, check for malloc failure.
Anton Khirnov [Sat, 5 Apr 2014 06:36:00 +0000 (08:36 +0200)]
lavc: add avcodec_free_context().
Right now, the caller has to manually manage some allocated
AVCodecContext fields, like extradata or subtitle_header. This is
fragile and prone to leaks, especially if we want to add more such
fields in the future.
The only reason for this behaviour is so that the AVStream codec context
can be reused for decoding. Such reuse is discouraged anyway, so this
commit is the first step to deprecating it.
Anton Khirnov [Sat, 5 Apr 2014 05:09:44 +0000 (07:09 +0200)]
lavc: remove the locking code in avcodec_close()
This function should not modify any global state, so there should be no
reason for any locking.
Michael Niedermayer [Sun, 18 May 2014 02:02:44 +0000 (04:02 +0200)]
avformat/framehash: switch to AVFMT_FLAG_BITEXACT
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 18 May 2014 02:02:44 +0000 (04:02 +0200)]
avformat/mmf: switch to AVFMT_FLAG_BITEXACT
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 18 May 2014 02:02:44 +0000 (04:02 +0200)]
avformat/matroskaenc: switch to AVFMT_FLAG_BITEXACT
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 18 May 2014 02:02:44 +0000 (04:02 +0200)]
avformat/mp3enc: switch to AVFMT_FLAG_BITEXACT
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 18 May 2014 02:02:44 +0000 (04:02 +0200)]
avformat/nutenc: switch to AVFMT_FLAG_BITEXACT
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 18 May 2014 02:02:44 +0000 (04:02 +0200)]
avformat/rtpenc: switch to AVFMT_FLAG_BITEXACT
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 12 May 2014 22:03:30 +0000 (00:03 +0200)]
avformat/aviobuf/ff_get_line: also accept \r as end of line character
Fixes Ticket3108
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Olivier Langlois [Tue, 6 May 2014 21:16:48 +0000 (17:16 -0400)]
ffplay: Use av_gettime_relative()
Whenever av_gettime() is used to measure relative period of time,
av_gettime_relative() is prefered as it guarantee monotonic time
on supported platforms.
Signed-off-by: Olivier Langlois <olivier@trillion01.com>
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 17 May 2014 18:22:53 +0000 (20:22 +0200)]
Merge commit '
584f88409062f7a134e7391887899e8e723ab6ff '
* commit '
584f88409062f7a134e7391887899e8e723ab6ff ':
riff: Pass block_align to estimate frame duration
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Olivier Langlois [Tue, 6 May 2014 21:16:51 +0000 (17:16 -0400)]
lavf: Use av_gettime_relative()
Whenever av_gettime() is used to measure relative period of time,
av_gettime_relative() is prefered as it guarantee monotonic time
on supported platforms.
Signed-off-by: Olivier Langlois <olivier@trillion01.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Sat, 17 May 2014 14:13:05 +0000 (16:13 +0200)]
configure: make vp9 decoder select the parser.
The parser is needed. FATE breaks if not present.
Clément Bœsch [Sat, 17 May 2014 14:10:45 +0000 (16:10 +0200)]
configure: make sure pkg-config flags are populated in FT test.
Olivier Langlois [Tue, 6 May 2014 21:16:50 +0000 (17:16 -0400)]
tools: Use av_gettime_relative()
Whenever av_gettime() is used to measure relative period of time,
av_gettime_relative() is prefered as it guarantee monotonic time
on supported platforms.
Signed-off-by: Olivier Langlois <olivier@trillion01.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Olivier Langlois [Tue, 6 May 2014 21:16:49 +0000 (17:16 -0400)]
lavc: Use av_gettime_relative()
Whenever av_gettime() is used to measure relative period of time,
av_gettime_relative() is prefered as it guarantee monotonic time
on supported platforms.
Signed-off-by: Olivier Langlois <olivier@trillion01.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Olivier Langlois [Mon, 12 May 2014 20:26:37 +0000 (16:26 -0400)]
lavu: add av_gettime_relative()
These functions are using the POSIX clock_gettime() function with the
CLOCK_MONOTONIC clock id. If these are not present on the targeted
platform, the new functions will fallback on using the original realtime functions
av_gettime() and av_usleep().
Monotonic support can be added on other platforms with their
equivalent native system API eventually if possible.
Whenever time is requested to measure relative time, the monotonic clock,
when available, is superior to the system realtime clock because it is
not affected by discontinuous jumps in the system time
In a future step, offering the flexibility to let the user choose between
rt and monotonic clock for avdevices packets will be investigated.
It is very easy to experience the issues that this patch attempt to address
by rewinding back in the past the system time while ffmpeg is running.
this is breaking the ffmpeg report printing (ffmepg.c:print_report()) and
the the rate emulator functionality (-re) without the patch.
Signed-off-by: Olivier Langlois <olivier@trillion01.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
nu774 [Fri, 16 May 2014 11:25:46 +0000 (20:25 +0900)]
riff: Pass block_align to estimate frame duration
Fix incorrect wSamplesPerBlock(=0) written for ADPCM_IMA_WAV
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Michael Niedermayer [Sat, 17 May 2014 12:55:57 +0000 (14:55 +0200)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Fix compilation of libavcodec/x86/hevc_deblock.asm with nasm.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 17 May 2014 12:26:23 +0000 (14:26 +0200)]
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: add support for toggling between multiple video filters with the w key
ffplay: fix typo in docs
ffplay: try multiple sample rates if audio open fails
cmdutils: replace usages of "#ifdef __MINGW32__" with "#ifdef _WIN32" because MSVC only defines _WIN32
ffplay: fix compilation with Visual Studio
ffplay: increase AV_SYNC_THRESHOLD_MIN to 0.04
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Sat, 17 May 2014 09:47:28 +0000 (11:47 +0200)]
avfilter/edgedetect: reuse already defined ctx.
Marton Balint [Mon, 6 Jan 2014 20:14:23 +0000 (21:14 +0100)]
ffplay: add support for toggling between multiple video filters with the w key
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sat, 10 May 2014 12:59:28 +0000 (14:59 +0200)]
ffplay: fix typo in docs
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sat, 10 May 2014 12:32:43 +0000 (14:32 +0200)]
ffplay: try multiple sample rates if audio open fails
Should fix ticket #3509.
Signed-off-by: Marton Balint <cus@passwd.hu>
John Peebles [Sat, 17 May 2014 01:44:19 +0000 (21:44 -0400)]
cmdutils: replace usages of "#ifdef __MINGW32__" with "#ifdef _WIN32" because MSVC only defines _WIN32
With the previous patch, this should fix ticket #3580 as well.
Signed-off-by: John Peebles <johnpeeb@gmail.com>
Marton Balint [Sat, 10 May 2014 11:27:09 +0000 (13:27 +0200)]
ffplay: fix compilation with Visual Studio
Based on a patch by achristensen from trac.ffmpeg.org.
Partially fixes ticket #3580.
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sat, 10 May 2014 11:20:56 +0000 (13:20 +0200)]
ffplay: increase AV_SYNC_THRESHOLD_MIN to 0.04
Less than 0.04 sec delays should not be noticable, and it helps us with 50fps
content where some timing errors can cause a frame dup where it is not really
necessary.
Signed-off-by: Marton Balint <cus@passwd.hu>
Carl Eugen Hoyos [Sat, 17 May 2014 10:28:14 +0000 (12:28 +0200)]
Fix compilation of libavcodec/x86/hevc_deblock.asm with nasm.
Suggested-by: Reimar
Carl Eugen Hoyos [Fri, 16 May 2014 16:32:35 +0000 (18:32 +0200)]
Fix alaw and mulaw muxing in caf.
Fixes ticket #3644.
James Almer [Sat, 17 May 2014 00:59:06 +0000 (21:59 -0300)]
x86/hevc_deblock: use movhps instead of shuffling values
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Sat, 17 May 2014 00:59:05 +0000 (21:59 -0300)]
x86/hevc_deblock: fix label names
Also remove some unnecessary jmps
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Sat, 17 May 2014 00:59:04 +0000 (21:59 -0300)]
x86/hevc_deblock: fix usage of ABS1
The second argument is a temp register for non-SSSE3 cases
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Sat, 17 May 2014 00:59:03 +0000 (21:59 -0300)]
x86/hevc_deblock: merge movs with other instructions
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 17 May 2014 02:57:35 +0000 (04:57 +0200)]
doc/filters: fix typo
Found-by: bloody123
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 17 May 2014 01:13:01 +0000 (03:13 +0200)]
Merge commit '
34e2ce5dde073244ccb2b62f930e96fe612690f7 '
* commit '
34e2ce5dde073244ccb2b62f930e96fe612690f7 ':
hlsenc: Set the default codecs to AAC and H264
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Mickaël Raulet [Fri, 16 May 2014 23:09:32 +0000 (01:09 +0200)]
hevc: fix key_frame as an IRAP
it was always 1 before with ISOBMFF(cherry picked from commit
fb1402b1ec78d80acd6ced76bf78d65560965c4c )
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Thu, 15 May 2014 18:43:46 +0000 (21:43 +0300)]
hlsenc: Set the default codecs to AAC and H264
Most HLS implementation only support these codecs.
Signed-off-by: Martin Storsjö <martin@martin.st>
Reynaldo H. Verdejo Pinochet [Fri, 16 May 2014 17:39:03 +0000 (13:39 -0400)]
rtmpproto: info out for unsupported auth vars
Should aid debugging badly formatted URLs
Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
Reynaldo H. Verdejo Pinochet [Fri, 16 May 2014 17:22:21 +0000 (13:22 -0400)]
rtmpproto: avoid setting auth var value if null
Use default values if parsed variable is found not to
have any value. Avoids crashing at strlen for salt/user
on the auth call afterwards and needless NULL assignments
for the rest (default is already NULL for those).
Should fix Coverity Scan issues #966644 and #966645
Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
Michael Niedermayer [Fri, 16 May 2014 20:24:16 +0000 (22:24 +0200)]
Merge commit '
4d25c2bc76f0a708c2ba470b6bfeb547efe37115 '
* commit '
4d25c2bc76f0a708c2ba470b6bfeb547efe37115 ':
build: Support building using clang-usan and disable-optimization
Change not merged, as it has been fixed differently and this change
would prevent disabling optimizations with ubsan
See:
bebce653e5601ceafa004db0eb6b2c7d4d16f0c0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 16 May 2014 20:02:27 +0000 (22:02 +0200)]
Merge commit '
7c377f0e74de8ab57f6baa64f3ec197c82104764 '
* commit '
7c377f0e74de8ab57f6baa64f3ec197c82104764 ':
avisynth: set duration of audio streams
See:
ae8e2d7634e09fa57941c4c644ba1b6e4cf9eec6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 16 May 2014 19:22:21 +0000 (21:22 +0200)]
Merge commit '
4735784f1ced27026fbeada5fd31505132e565e9 '
* commit '
4735784f1ced27026fbeada5fd31505132e565e9 ':
FATE/opus: increase fuzz for the celt tests
Merged-by: Michael Niedermayer <michaelni@gmx.at>
plepere [Fri, 16 May 2014 09:44:20 +0000 (11:44 +0200)]
avcodec/x86/hevc: updated to use x86util macros
Reviewed-by: James Almer <jamrial@gmail.com>
Reviewed-by: Ronald S. Bultje
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
plepere [Thu, 15 May 2014 14:31:11 +0000 (16:31 +0200)]
avcodec/x86/hevc: added DBF assembly functions
Reviewed-by: James Almer <jamrial@gmail.com>
Reviewed-by: Ronald S. Bultje
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Katerina Barone-Adesi [Fri, 16 May 2014 16:07:34 +0000 (18:07 +0200)]
build: Support building using clang-usan and disable-optimization
Clang Undefined Behaviour Sanitizer seems to make non-constant constant
expressions, making the compilation fail when they are used within
inline assembly if no optimization is requested.
Add -O1 to the cflags to hide the misbehaviour.
Bug-Id: 683
Michael Niedermayer [Fri, 16 May 2014 16:47:42 +0000 (18:47 +0200)]
avcodec/mpeg12enc: avoid floats in the aspect ratio info setup code
This fixes potential rounding issues with floats, and also
fixes a division by 0
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Frederic Turmel [Thu, 15 May 2014 22:02:16 +0000 (15:02 -0700)]
avcodec/mpeg12enc: Favor storing DAR instead of SAR
fixes Ticket 2689
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 16 May 2014 14:13:36 +0000 (16:13 +0200)]
estimate_timings_from_pts: Execute max 1 iteration extra to find more than 1 duration
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Gaullier Nicolas [Wed, 14 May 2014 16:25:13 +0000 (16:25 +0000)]
estimate_timings_from_pts: Try to get the duration for all streams
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 16 May 2014 13:49:23 +0000 (15:49 +0200)]
estimate_timings_from_pts: simplify filesize end check
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Gaullier Nicolas [Wed, 14 May 2014 16:25:13 +0000 (16:25 +0000)]
estimate_timings_from_pts: Also consider packet duration
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Gaullier Nicolas [Wed, 14 May 2014 16:25:13 +0000 (16:25 +0000)]
estimate_timings_from_pts: Warn about A/V streams for which no duration could be set
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Hendrik Leppkes [Thu, 8 May 2014 13:51:15 +0000 (09:51 -0400)]
avisynth: set duration of audio streams
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Anton Khirnov [Thu, 15 May 2014 06:02:59 +0000 (08:02 +0200)]
FATE/opus: increase fuzz for the celt tests
This seems to be needed on some 32bit arches.
Clément Bœsch [Fri, 16 May 2014 04:53:36 +0000 (06:53 +0200)]
avfilter/vignette: reindent after previous commit.
Clément Bœsch [Fri, 16 May 2014 04:53:18 +0000 (06:53 +0200)]
avfilter/vignette: add direct rendering.
Clément Bœsch [Fri, 16 May 2014 04:48:41 +0000 (06:48 +0200)]
vignette: reuse already declared ctx.
Masa Utashiro [Fri, 16 May 2014 04:31:56 +0000 (06:31 +0200)]
avfilter/vignette: fix input frame memory leak.
Fixes Ticket #3642.
James Almer [Thu, 15 May 2014 22:54:00 +0000 (19:54 -0300)]
swresample: add swri_resample_float_avx
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Thu, 15 May 2014 22:03:02 +0000 (19:03 -0300)]
configure: add check for AVX inline support
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 16 May 2014 02:38:10 +0000 (04:38 +0200)]
avcodec/opusdec: fix some const correctness
also make a const array static
Fixes 2 warnings
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 16 May 2014 01:02:57 +0000 (03:02 +0200)]
avcodec/cavs: prevent out of array read
The used value should not matter as long as its within the array
as it is multiplied by 0
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 16 May 2014 00:06:00 +0000 (02:06 +0200)]
avcodec/utils: Fix undefined behavior in avpriv_toupper4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Thu, 15 May 2014 22:43:54 +0000 (00:43 +0200)]
Use av_restrict instead of restrict in libavcodec/opus_celt.c.
Michael Niedermayer [Thu, 15 May 2014 21:44:50 +0000 (23:44 +0200)]
avcodec/x86/dsputil_mmx: Fix build with clang-usan
Found-by: Katerina Barone-Adesi
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Fri, 7 Dec 2012 17:26:30 +0000 (18:26 +0100)]
x86: sbrdsp: implement SSE qmf_deint_neg
From 133 (unrolled av_intfloat32 C) to 59 cycles on Arrandale/Win64.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 15 May 2014 20:41:52 +0000 (22:41 +0200)]
avcodec/opus: fix doxygen comments to be associated with the correct fields
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 15 May 2014 20:35:40 +0000 (22:35 +0200)]
ffmpeg: bitstream filters require split out side data
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 15 May 2014 19:34:34 +0000 (21:34 +0200)]
Revert "avcodec/hevc: fix outputted AVFrame.key_frame"
This is not correct
Requested-by: mraulet
This reverts commit
973de9ebf8796bc2720a9959a9a535cf4023c58a .
Michael Niedermayer [Thu, 15 May 2014 19:13:31 +0000 (21:13 +0200)]
Merge commit '
d3f5b94762fb803c0f3b29f9ad6c5eaa813998ba '
* commit '
d3f5b94762fb803c0f3b29f9ad6c5eaa813998ba ':
aarch64: opus NEON iMDCT and FFT
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 15 May 2014 19:06:18 +0000 (21:06 +0200)]
Merge commit '
7c5ca546a0747a20c7f7fb5550455c3042699ee9 '
* commit '
7c5ca546a0747a20c7f7fb5550455c3042699ee9 ':
configure: fix enable-libopus help string
See:
434ba17b22c61d968d595c02230c38e0bef1ea24
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 15 May 2014 19:01:07 +0000 (21:01 +0200)]
Merge commit '
5e2ba41d4b94de1fa5267081d6c4b6b262c8d86f '
* commit '
5e2ba41d4b94de1fa5267081d6c4b6b262c8d86f ':
build: add avresample after avcodec to FFLIBS
Conflicts:
Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Olivier Langlois [Thu, 15 May 2014 06:22:11 +0000 (02:22 -0400)]
doc: Add udp broadcast option description
Describe the option added in commit
f1c167496e41cabc2bd1b890b149e4b34648cad6
Signed-off-by: Olivier Langlois <olivier@trillion01.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 15 May 2014 17:41:38 +0000 (19:41 +0200)]
avcodec/options: avcodec_copy_context() Check subtitle_header_size instead of setting it
The value is already copied in the generic code so it should always match
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 15 May 2014 17:39:06 +0000 (19:39 +0200)]
Merge commit '
3b2fbe67bd63b00331db2a9b213f6d420418a312 '
* commit '
3b2fbe67bd63b00331db2a9b213f6d420418a312 ':
lavc: properly handle subtitle_header in avcodec_copy_context()
Conflicts:
libavcodec/options.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 15 May 2014 17:31:32 +0000 (19:31 +0200)]
Merge commit '
efc7df6c1f11b20a48e60c3f743ce2331b661973 '
* commit '
efc7df6c1f11b20a48e60c3f743ce2331b661973 ':
lavc: preserve the original private data in avcodec_copy_context()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 15 May 2014 17:24:19 +0000 (19:24 +0200)]
Merge commit '
c9281a01b78cc3f09e36300a0ca3f5824d1c74cf '
* commit '
c9281a01b78cc3f09e36300a0ca3f5824d1c74cf ':
lavf: drop the zero-sized packets hack
Conflicts:
libavformat/mux.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 15 May 2014 16:51:57 +0000 (18:51 +0200)]
Merge commit '
0c1959b056f6ccaa2eee2c824352ba93c8e36d52 '
* commit '
0c1959b056f6ccaa2eee2c824352ba93c8e36d52 ':
lavf: add AVFMT_FLAG_BITEXACT.
Conflicts:
doc/APIchanges
libavformat/avformat.h
libavformat/flacenc.c
libavformat/movenc.c
libavformat/oggenc.c
libavformat/options_table.h
libavformat/version.h
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>