]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Wed, 13 Aug 2014 22:29:06 +0000 (00:29 +0200)]
Merge commit '
8ddc32629a6d6be77256694c9e322dde134609f3 '
* commit '
8ddc32629a6d6be77256694c9e322dde134609f3 ':
mem: add av_strndup() for duplicating substrings
Conflicts:
libavutil/mem.c
libavutil/mem.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 13 Aug 2014 22:23:30 +0000 (00:23 +0200)]
Merge commit '
aa51b0492bfced6d650fb5ff419e2b13fde6833d '
* commit '
aa51b0492bfced6d650fb5ff419e2b13fde6833d ':
avconv: rename output_packet() to process_input_packet()
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 13 Aug 2014 22:17:43 +0000 (00:17 +0200)]
Merge commit '
159a06dfc83d189f753c4583583ddfb571552ff5 '
* commit '
159a06dfc83d189f753c4583583ddfb571552ff5 ':
stereo3d: initialize AVStereo3D to zero
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 13 Aug 2014 22:11:16 +0000 (00:11 +0200)]
Merge commit '
4e629ef80e62a54636cb46033998177dd08cf3ad '
* commit '
4e629ef80e62a54636cb46033998177dd08cf3ad ':
http: Fix authentication, broken since
6a463e7fb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 13 Aug 2014 22:04:42 +0000 (00:04 +0200)]
Merge commit '
db68ef898a3802e51b6f41fd600d0d46d058e3f8 '
* commit '
db68ef898a3802e51b6f41fd600d0d46d058e3f8 ':
ogg: update event_flags with STREAM_/METADATA_UPDATED whenever metadata changes.
Conflicts:
libavformat/oggparsevorbis.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 13 Aug 2014 21:51:03 +0000 (23:51 +0200)]
Merge commit '
cc3e88a2b9e7ecf62e4ea1c41ce1623cea67ee96 '
* commit '
cc3e88a2b9e7ecf62e4ea1c41ce1623cea67ee96 ':
mov: update AVFormatContext.event_flags with METADATA_UPDATED whenever metadata changes.
Conflicts:
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 13 Aug 2014 21:44:10 +0000 (23:44 +0200)]
Merge commit '
fa3a5dd4dea34baa6bb2f7fe6006fc4b2888f2aa '
* commit '
fa3a5dd4dea34baa6bb2f7fe6006fc4b2888f2aa ':
nutdec: update AVFormatContext.event_flags with STREAM_/METADATA_UPDATED whenever metadata changes.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 13 Aug 2014 21:36:25 +0000 (23:36 +0200)]
Merge commit '
0f789322efa78a672e4c3027e5cc12b8a947043a '
* commit '
0f789322efa78a672e4c3027e5cc12b8a947043a ':
flvdec: update AVFormatContext.event_flags with METADATA_UPDATED whenever metadata changes.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 13 Aug 2014 21:14:17 +0000 (23:14 +0200)]
Merge commit '
93c04e095dc37ebdab22174e88cfa91e24940866 '
* commit '
93c04e095dc37ebdab22174e88cfa91e24940866 ':
Expose metadata found in onCuePoint events in .flv files.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 13 Aug 2014 21:02:56 +0000 (23:02 +0200)]
Merge commit '
019d3fccc4dcf5c8379112f697ce9eb08edee9b9 '
* commit '
019d3fccc4dcf5c8379112f697ce9eb08edee9b9 ':
Set protocol-level metadata in AVFormatContext any time a packet is read.
Conflicts:
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 13 Aug 2014 20:54:31 +0000 (22:54 +0200)]
Merge commit '
7e38903b5c86a759549e70647ae42bb22d353b14 '
* commit '
7e38903b5c86a759549e70647ae42bb22d353b14 ':
http: enable icy metadata by default.
Conflicts:
Changelog
libavformat/http.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 13 Aug 2014 20:47:35 +0000 (22:47 +0200)]
Merge commit '
7601f9412a2d3387617a45966b65b452a632c27a '
* commit '
7601f9412a2d3387617a45966b65b452a632c27a ':
http: export icecast metadata as an option with name "metadata".
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 13 Aug 2014 20:39:54 +0000 (22:39 +0200)]
Merge commit '
a8c104a511f97e4ea617df73b31737e28a8a5126 '
* commit '
a8c104a511f97e4ea617df73b31737e28a8a5126 ':
AVOption: add support for dictionary types.
Conflicts:
libavutil/opt.c
libavutil/opt.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 13 Aug 2014 20:22:52 +0000 (22:22 +0200)]
Merge commit '
afbd4b7e093adf6d7a830b32759ca3ba8500363d '
* commit '
afbd4b7e093adf6d7a830b32759ca3ba8500363d ':
lavf: add AVFormatContext/AVStream fields for signaling to the user when events happen.
Conflicts:
libavformat/avformat.h
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Wed, 13 Aug 2014 18:50:51 +0000 (20:50 +0200)]
reset and complete RELEASE_NOTES for the next version
Ronald S. Bultje [Tue, 12 Aug 2014 22:11:05 +0000 (18:11 -0400)]
vp9: ignore reference segmentation map if error_resilience flag is set.
Fixes ffvp9_fails_where_libvpx.succeeds.webm from ticket 3849.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Wed, 13 Aug 2014 18:02:21 +0000 (20:02 +0200)]
Changelog: notify about the recent performance boost in dctdnoiz filter
Clément Bœsch [Sun, 10 Aug 2014 19:49:55 +0000 (21:49 +0200)]
avfilter/dctdnoiz: add slice threading
Anton Khirnov [Tue, 12 Aug 2014 16:24:19 +0000 (16:24 +0000)]
mem: add av_strndup() for duplicating substrings
Anton Khirnov [Mon, 25 Nov 2013 08:57:54 +0000 (09:57 +0100)]
avconv: rename output_packet() to process_input_packet()
It more accurately describes what this function does
Felix Abecassis [Tue, 12 Aug 2014 12:56:35 +0000 (14:56 +0200)]
stereo3d: initialize AVStereo3D to zero
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Martin Storsjö [Wed, 13 Aug 2014 11:32:52 +0000 (14:32 +0300)]
http: Fix authentication, broken since
6a463e7fb
The cur_*auth_type variables were set before the http_connect call
prior to
6a463e7fb - their sole purpose is to record the
authentication type used to do the latest request, since parsing
the http response sets the new type in the auth state.
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Wed, 13 Aug 2014 16:44:59 +0000 (18:44 +0200)]
Merge commit '
72199e1041b4052544e181ad90b431ca6704da12 '
* commit '
72199e1041b4052544e181ad90b431ca6704da12 ':
configure: Check for nanosleep in headers as well, not only in libs
See:
223c374a9d977fdfe9af94858693c632f644aac7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 13 Aug 2014 16:32:53 +0000 (18:32 +0200)]
Merge commit '
428b0578c64241fc677fed7083cc8fe65e10f32e '
* commit '
428b0578c64241fc677fed7083cc8fe65e10f32e ':
w32threads: Use newer thread synchronization functions when targeting Vista
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 13 Aug 2014 16:26:35 +0000 (18:26 +0200)]
Merge commit '
8bf3bf69ad7333bf0c45f4d2797fc2c61bc8922f '
* commit '
8bf3bf69ad7333bf0c45f4d2797fc2c61bc8922f ':
http: Stop reading after receiving the whole file for non-chunked transfers
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Andrew Stone [Tue, 12 Aug 2014 21:03:55 +0000 (17:03 -0400)]
ogg: update event_flags with STREAM_/METADATA_UPDATED whenever metadata changes.
Originally, AVFormatContext and a metadata dict were provided to ff_vorbis_comment(),
but this presented issues if an AVStream was being updated or the metadata on
AVFormatContext wasn't actually being updated. To remedy this, ff_vorbis_stream_comment()
explicitly updates a stream's metadata and sets any necessary flags.
ff_vorbis_comment() does not modify any flags, and any calls to it that update
AVFormatContext's metadata (just a single call) must also update
AVFormatContext.event_flags after detecting any metadata changes to the provided
dictionary, as signaled by a positive return value.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Andrew Stone [Tue, 12 Aug 2014 21:03:54 +0000 (17:03 -0400)]
mov: update AVFormatContext.event_flags with METADATA_UPDATED whenever metadata changes.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Andrew Stone [Tue, 12 Aug 2014 21:03:53 +0000 (17:03 -0400)]
nutdec: update AVFormatContext.event_flags with STREAM_/METADATA_UPDATED whenever metadata changes.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Andrew Stone [Tue, 12 Aug 2014 21:03:52 +0000 (17:03 -0400)]
flvdec: update AVFormatContext.event_flags with METADATA_UPDATED whenever metadata changes.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Stefano Sabatini [Wed, 13 Aug 2014 15:57:05 +0000 (17:57 +0200)]
doc/filters: correct confusing statements about *showinfo shown values
Fix trac issue #3850.
Andrew Stone [Mon, 11 Aug 2014 17:35:09 +0000 (13:35 -0400)]
Expose metadata found in onCuePoint events in .flv files.
Currently, only onMetaData is used, but some providers (wrongly)
put metadata into onCuePoint events, and it's still nice to be
able to use that data.
onCuePoint events also present metadata slightly differently than
onMetaData events: all metadata is found inside an object called
"parameters". In order to extract this metadata, it's easiest to
recurse through the object tree and pull out anything found in
child objects and put it in the top-level metadata.
Reference: http://help.adobe.com/en_US/FlashPlatform/reference/actionscript/2/help.html?content=
00001404 .html
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Andrew Stone [Thu, 31 Jul 2014 23:56:37 +0000 (19:56 -0400)]
Set protocol-level metadata in AVFormatContext any time a packet is read.
If any option named "metadata" is set inside the context, it is pulled up to
the context and then the option is cleared.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Andrew Stone [Thu, 31 Jul 2014 23:56:36 +0000 (19:56 -0400)]
http: enable icy metadata by default.
It won't hurt servers that don't care about the header,
and those that do will include it by default.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Andrew Stone [Thu, 31 Jul 2014 23:56:35 +0000 (19:56 -0400)]
http: export icecast metadata as an option with name "metadata".
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Andrew Stone [Thu, 31 Jul 2014 23:56:34 +0000 (19:56 -0400)]
AVOption: add support for dictionary types.
In order to support metadata being set as an option, it's necessary to be able
to set dictionaries as values.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Andrew Stone [Fri, 8 Aug 2014 17:09:23 +0000 (13:09 -0400)]
lavf: add AVFormatContext/AVStream fields for signaling to the user when events happen.
The only flags, for now, indicate if metadata was updated and are set after each call to
av_read_frame(). This comes with the caveat that, on stream start, it might not be set properly
as packets might be buffered in AVFormatContext.packet_buffer before being given to the user
in av_read_frame().
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Paul B Mahol [Tue, 12 Aug 2014 11:29:44 +0000 (11:29 +0000)]
avfitler/vf_perspective: support slice threading
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Thu, 7 Aug 2014 16:34:35 +0000 (18:34 +0200)]
avutil: turn arm setend into a cpuflag
this allows disabling and enabling it
it also prevents crashes if vfpv3 and neon are disabled which previously
would have enabled the flag
And last but not least one can enable setend on cpus like cortex-a8 where
its fast but disabled by default
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Mon, 11 Aug 2014 12:02:28 +0000 (15:02 +0300)]
configure: Check for nanosleep in headers as well, not only in libs
On mingw64 with c++11 support, the link libraries do contain a
nanosleep function, while it isn't exposed via the headers. Using
check_func_headers instead of a plain check_func fixes this
misdetection.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 6 Aug 2014 06:52:38 +0000 (09:52 +0300)]
w32threads: Use newer thread synchronization functions when targeting Vista
When explicitly targeting Vista or newer (which only happens if the
caller explicitly sets _WIN32_WINNT to a high enough value via the
extra cflags option - otherwise configure script sets
-D_WIN32_WINNT=0x0502), we already unconditionally link to the
ConditionVariable functions, since
4622f11f9 .
Similarly use the newer -Ex versions of CreateEvent, CreateSemaphore,
InitializeCriticalSection and WaitForSingleObject, that all appeared
in Vista. When building Windows Store applications, the older versions
of these functions aren't available, only the -Ex functions. When
doing such a build, the user can set -D_WIN32_WINNT=0x0600 to
forcibly use the newer functions instead.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Mon, 11 Aug 2014 07:18:28 +0000 (10:18 +0300)]
http: Stop reading after receiving the whole file for non-chunked transfers
Previously this logic was only used if the server didn't
respond with Connection: close, but use it even for that case,
if the server response is non-chunked.
Originally the http code has relied on Connection: close to close
the socket when the file/stream is received - the http protocol
code just kept reading from the socket until the socket was closed.
In
f240ed18 we added a check for the file size, because some
http servers didn't respond with Connection: close (and wouldn't
close the socket) even though we requested it, which meant that the
http protocol blocked for a long time at the end of files, waiting
for a socket level timeout.
When reading over tls, trying to read at the end of the connection,
when the peer has closed the connection, can produce spurious (but
harmless) warnings. Therefore always voluntarily stop reading when
the specified file size has been received, if not using a chunked
transfer encoding. (For chunked transfers, we already return 0
as soon as we get the chunk header indicating end of stream.)
Signed-off-by: Martin Storsjö <martin@martin.st>
James Almer [Wed, 13 Aug 2014 03:34:17 +0000 (00:34 -0300)]
lavc/dnxhd: ff_dnxhd_cid_table is not exported
Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Darnley [Tue, 12 Aug 2014 21:22:06 +0000 (23:22 +0200)]
cvcodec/flacdsp_lpc_template: osmetic fix
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Darnley [Tue, 12 Aug 2014 21:22:03 +0000 (23:22 +0200)]
lavc/flacenc: partially unroll loop in flac_enc_lpc_16
It now does 12 samples per iteration, up from 4.
From 1.8 to 3.2 times faster again. 3.6 to 5.7 times faster overall.
Runtime is reduced by a further 2 to 18%. Overall runtime reduced by
4 to 50%.
Same conditions as before apply.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Tue, 12 Aug 2014 23:19:24 +0000 (20:19 -0300)]
avcodec/idctdsp: make add/put_pixels_clamped_c internal functions
This reduces code duplication and differences with the fork.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Darnley [Tue, 12 Aug 2014 21:22:02 +0000 (23:22 +0200)]
lavc/flacenc: add sse4 version of the 16-bit lpc encoder
From 1.8 to 2.4 times faster. Runtime is reduced by 2 to 39%. The
speed-up generally increases with compression_level.
This lpc encoder is not used with levels < 3 so it provides no speed-up
in these cases.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Tue, 12 Aug 2014 21:38:32 +0000 (18:38 -0300)]
lavfi: duplicate ff_log2_tab
Fixes compilation failures on msvc/icl shared builds
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Pascal Massimino [Sat, 9 Aug 2014 11:06:17 +0000 (13:06 +0200)]
avcodec: add C xvid IDCT support
Thanks to Pascal Massimino and Michael Militzer for permission to use under LGPL
The xvid idct code is from xvid, and nearly unchanged to make future syncing easy
the integration into ffmpeg is done by the commiter
the commit message is written by the commiter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Tue, 12 Aug 2014 18:21:24 +0000 (15:21 -0300)]
lsws: duplicate ff_log2_tab
libswscale uses the table but wasn't duplicating it like the rest of the libs.
This should fix compilation failures on msvc/icl after lavu stopped exporting
internal functions and tables.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Aug 2014 15:08:45 +0000 (17:08 +0200)]
Merge commit '
da7d839a0d3ec40423a665dc85e0cfaed3f92eb8 '
* commit '
da7d839a0d3ec40423a665dc85e0cfaed3f92eb8 ':
ffv1dec: check that global parameters do not change in version 0/1
Conflicts:
libavcodec/ffv1dec.c
See:
b05cd1ea7e45a836f7f6071a716c38bb30326e0f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Aug 2014 14:58:57 +0000 (16:58 +0200)]
Merge commit '
3187fa14a326908f9471a038e3b5b24c0eaf655e '
* commit '
3187fa14a326908f9471a038e3b5b24c0eaf655e ':
hevc_mvs: avoid deriving tmvp in amvp
See:
373677f95816924a3790c174e83ec2e378962c44
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Aug 2014 14:52:14 +0000 (16:52 +0200)]
Merge commit '
14ca0aa69b5d954ce56d0826ab9f1f70e535c92a '
* commit '
14ca0aa69b5d954ce56d0826ab9f1f70e535c92a ':
hevc: wait proper position for tmvp
Conflicts:
libavcodec/hevc_mvs.c
See:
ed248e7f70d98abe099392e154d1cdd0f15faa3c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Aug 2014 14:39:20 +0000 (16:39 +0200)]
Merge commit '
cf6090dc6252f2b276aa4133e3d73a89f4c6046c '
* commit '
cf6090dc6252f2b276aa4133e3d73a89f4c6046c ':
hevc: use intreadwrite
Conflicts:
libavcodec/hevc_mvs.c
See:
7a4a5515b0ce97f1c4e18ed012cc3f86328dd220
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Aug 2014 14:27:17 +0000 (16:27 +0200)]
Merge commit '
ed53cc217f6a6e4ddb35e3f01a79496091dc82dc '
* commit '
ed53cc217f6a6e4ddb35e3f01a79496091dc82dc ':
hevc: derive partial merge list
Conflicts:
libavcodec/hevc_mvs.c
See:
4576eff05d94a5e0b853a7a595d31351cc539e7b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Aug 2014 14:19:32 +0000 (16:19 +0200)]
Michael Niedermayer [Tue, 12 Aug 2014 14:06:33 +0000 (16:06 +0200)]
Merge commit '
09182b3224370e1d636631e77f201a8388766bd6 '
* commit '
09182b3224370e1d636631e77f201a8388766bd6 ':
hevc: simplify rounding
Conflicts:
libavcodec/hevc_mvs.c
See:
2e471e4703ed5aaab6d6b6bf5a3c6895b79f02b4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 12 Aug 2014 13:58:37 +0000 (15:58 +0200)]
Merge commit '
d1b1c3bb5ef1bee409c06c3bcacfb8674e1cb574 '
* commit '
d1b1c3bb5ef1bee409c06c3bcacfb8674e1cb574 ':
hevc: reorder loops
Conflicts:
libavcodec/hevc.c
See:
eca1957c4cbee66a0b1f3dcabaffe68d61885f16
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Tue, 12 Aug 2014 12:27:37 +0000 (14:27 +0200)]
Remove useless configure option "--enable-sram".
Ronald S. Bultje [Tue, 12 Aug 2014 10:37:00 +0000 (06:37 -0400)]
vp9/x86: fix bug in intra_pred_hd_32x32.
Fixes mismatch in first keyframe in sample
ffvp9_fails_where_libvpx.succeeds.webm from ticket 3849. There's still
a second mismatch a few frames into the sample.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Sun, 10 Aug 2014 05:24:01 +0000 (02:24 -0300)]
x86/dca: remove unused header
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Mon, 4 Aug 2014 02:53:39 +0000 (23:53 -0300)]
x86/ttadsp: remove an unnecessary mova
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 30 Aug 2013 02:51:09 +0000 (04:51 +0200)]
ffv1dec: check that global parameters do not change in version 0/1
Such changes are neither allowed nor supported
Found-by: ami_stuff
Bug-Id: CVE-2013-7020
CC: libav-stable@libav.org
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Christophe Gisquet [Fri, 8 Aug 2014 18:21:04 +0000 (18:21 +0000)]
hevc_mvs: avoid deriving tmvp in amvp
Reduces the number of calls to tmvp derivation from 933685 to 586271 on
a sequence.
Reviewed-by: Mickaël Raulet <mraulet@insa-rennes.fr>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Christophe Gisquet [Sun, 20 Jul 2014 07:34:58 +0000 (09:34 +0200)]
hevc: wait proper position for tmvp
The position is either rounded or not checked, so delay the wait to
check the proper value.
Reviewed-by: Mickaël Raulet <mraulet@insa-rennes.fr>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Christophe Gisquet [Fri, 8 Aug 2014 18:21:02 +0000 (18:21 +0000)]
hevc: use intreadwrite
When dealing with MVs, both components may be processed at a time.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Christophe Gisquet [Fri, 8 Aug 2014 18:21:01 +0000 (18:21 +0000)]
hevc: derive partial merge list
The merge list only needs to be derived up to the merge index.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Christophe Gisquet [Fri, 8 Aug 2014 18:21:00 +0000 (18:21 +0000)]
hevc: derive partially amvp list
When the candidate has been found, no need to derive others.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Christophe Gisquet [Thu, 10 Jul 2014 06:47:55 +0000 (06:47 +0000)]
hevc: simplify rounding
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Christophe Gisquet [Fri, 8 Aug 2014 18:20:58 +0000 (18:20 +0000)]
hevc: reorder loops
iterate over memory in a more continuous order
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Martin Storsjö [Tue, 12 Aug 2014 09:23:38 +0000 (11:23 +0200)]
configure: Check for nanosleep in headers as well, not only in libs
On mingw64 with c++11 support, the link libraries do contain a
nanosleep function, while it isn't exposed via the headers. Using
check_func_headers instead of a plain check_func fixes this
misdetection.
Suggested-by: Hendrik Leppkes <h.leppkes@gmail.com>
See: [FFmpeg-devel] [PATCH] fix: 'make' with mingw32
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Tue, 12 Aug 2014 08:03:36 +0000 (10:03 +0200)]
Fix warning if https protocol was requested but isn't available.
Carl Eugen Hoyos [Tue, 12 Aug 2014 06:48:20 +0000 (08:48 +0200)]
Check for hevc startcode when muxing into mpeg-ts.
James Almer [Sun, 10 Aug 2014 00:04:35 +0000 (21:04 -0300)]
lavu: stop exporting internal functions
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Mon, 11 Aug 2014 19:35:39 +0000 (16:35 -0300)]
lavu: rename ff_opencl_set_parameter() to avpriv_opencl_set_parameter()
It was wrongly being exported and used by libavfilter.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Daniel Oberhoff [Mon, 11 Aug 2014 22:52:45 +0000 (00:52 +0200)]
avfilter: ported lenscorrection filter from frei0r
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Mon, 11 Aug 2014 22:06:08 +0000 (22:06 +0000)]
proresenc_kostya: report buffer overflow
If the allocated size, despite best efforts, is too small, exit
with the appropriate error.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Mon, 11 Aug 2014 22:06:07 +0000 (22:06 +0000)]
proresenc_kostya: remove unneeded parameters
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Reimar Döffinger [Mon, 11 Aug 2014 17:55:26 +0000 (19:55 +0200)]
Add missing initialization for AVProbeData.
This has become necessary since the new mime field was added.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Michael Niedermayer [Mon, 11 Aug 2014 13:36:22 +0000 (15:36 +0200)]
avcodec/snow: fix null pointer dereference in cleanup after allocation failure
Fixes: snowf.avi
Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 11 Aug 2014 13:16:29 +0000 (15:16 +0200)]
avcodec/huffyuvdec: fix overread checks
Fixes: ffvhuff_f.avi
Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 11 Aug 2014 13:15:19 +0000 (15:15 +0200)]
avcodec/get_bits: add BITS_LEFT() for finding the bits left with an opened reader
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Sun, 10 Aug 2014 00:04:33 +0000 (21:04 -0300)]
lavf: stop exporting internal functions
Except for those currently used by ffserver.
Signed-off-by: James Almer <jamrial@gmail.com>
Also left some others that seemed used by applications other than ffserver
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Sun, 10 Aug 2014 01:01:47 +0000 (22:01 -0300)]
lavf/mpegts: remove obsolete ff_mpegts_parse_* cruft
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Sun, 10 Aug 2014 01:01:46 +0000 (22:01 -0300)]
lavc/raw: remove obsolete ff_raw_pix_fmt_tags cruft
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Sun, 10 Aug 2014 00:04:32 +0000 (21:04 -0300)]
lavc: stop exporting internal functions and tables
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 11 Aug 2014 11:07:39 +0000 (13:07 +0200)]
avcodec/idctdsp: move add/put_pixels_clamped_c to header
This allows sharing them with the xvid IDCT
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Christophe Gisquet [Sun, 10 Aug 2014 17:22:06 +0000 (19:22 +0200)]
hevc: do generic validation of bitstream
After finishing parsing VPS/SPS/PPS/slice header, check remaining bits,
and if an overconsumption occurred, report invalid data.
Liked-by: BBB
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Mon, 11 Aug 2014 00:04:56 +0000 (20:04 -0400)]
hevc: add missing comma in log message.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 11 Aug 2014 00:16:43 +0000 (02:16 +0200)]
avcodec/vc1dec: do not crash when flushing without an allocated frame
Fixes Ticket3837
Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 Aug 2014 23:34:34 +0000 (01:34 +0200)]
swresample: check av_opt_set for failure in swr_alloc_set_opts()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Sun, 10 Aug 2014 22:35:19 +0000 (00:35 +0200)]
swresample: document the need to configure the context using AVOptions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 Aug 2014 22:09:09 +0000 (00:09 +0200)]
avformat/movenc: Fix printf type
Found-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 Aug 2014 21:47:09 +0000 (23:47 +0200)]
Merge commit '
08b94f160a2c966bb83e32bde0e52246fafa2155 '
* commit '
08b94f160a2c966bb83e32bde0e52246fafa2155 ':
configure: Don't pass MSVC compiler options -M[TD] to armasm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 Aug 2014 21:41:08 +0000 (23:41 +0200)]
Merge commit '
cc1d8c54c19dd14fb851e3e7a7793d6b3bd75e94 '
* commit '
cc1d8c54c19dd14fb851e3e7a7793d6b3bd75e94 ':
avcodec: Postpone FF_IDCT_XVIDMMX removal until the next version bump
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Sun, 10 Aug 2014 20:31:33 +0000 (22:31 +0200)]
Remove panscan information in av_frame_copy_props() if resolution changes.
Fixes ticket #3750.
Michael Niedermayer [Sun, 10 Aug 2014 19:59:33 +0000 (21:59 +0200)]
avcodec/iff: check pixfmt for rgb8 / rgbn
Fixes out of array access
Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 Aug 2014 19:53:39 +0000 (21:53 +0200)]
avcodec/iff: Factorize av_pix_fmt_desc_get() out
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mark Reid [Sun, 10 Aug 2014 19:01:33 +0000 (12:01 -0700)]
avformat/movenc: check that reel_name length doesn't exceed UINT16_MAX
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 Aug 2014 18:51:15 +0000 (20:51 +0200)]
Merge commit '
d63443b9684fa7b3e086634f7b44b203b6d9221e '
* commit '
d63443b9684fa7b3e086634f7b44b203b6d9221e ':
lavc: drop the av_fast_{re,m}alloc compatibility wrappers
Conflicts:
libavcodec/utils.c
See:
a973e01501bc3ca5c61d778f97f350837d4ed481
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 10 Aug 2014 18:34:28 +0000 (20:34 +0200)]
Merge commit '
8dca0877e3e1457e9ec79ffa1ead1135aabb791c '
* commit '
8dca0877e3e1457e9ec79ffa1ead1135aabb791c ':
mpegts: Return proper error code on invalid input data
Conflicts:
libavformat/mpegtsenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>