]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Wed, 8 Oct 2014 21:48:32 +0000 (23:48 +0200)]
avcodec: Allow choosing the dump format field separator.
The default is to maintain the previous ", " for now.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 8 Oct 2014 21:33:24 +0000 (23:33 +0200)]
Merge commit '
20a5956b8daeee4cb59d6fa00ec809b02c04d7f8 '
* commit '
20a5956b8daeee4cb59d6fa00ec809b02c04d7f8 ':
dump: split audio and video probing on multiple lines
Conflicts:
libavcodec/utils.c
libavformat/dump.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 8 Oct 2014 20:53:48 +0000 (22:53 +0200)]
Merge commit '
5a419b2dd1881889d436f55741fd3ff3f9f436c4 '
* commit '
5a419b2dd1881889d436f55741fd3ff3f9f436c4 ':
pixdesc: return color properties names
Conflicts:
libavutil/pixdesc.c
libavutil/pixdesc.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 8 Oct 2014 20:37:59 +0000 (22:37 +0200)]
Merge commit '
04ccd584a70fad4ebb29ca340d704970ff313cbc '
* commit '
04ccd584a70fad4ebb29ca340d704970ff313cbc ':
pixfmt: mark further reserved values
Conflicts:
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 8 Oct 2014 20:28:23 +0000 (22:28 +0200)]
Merge commit '
c732c62cee43f651775af5547cff99d418248542 '
* commit '
c732c62cee43f651775af5547cff99d418248542 ':
doc: expand description for some color properties
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 8 Oct 2014 20:20:33 +0000 (22:20 +0200)]
Merge commit '
a2c00d22e71d13b72828147be86aa9e961c6cae6 '
* commit '
a2c00d22e71d13b72828147be86aa9e961c6cae6 ':
avprobe: print color properties for show_streams
Conflicts:
avprobe.c
Not merged as this code does not build and is incomplete, some parts only
appear in later commits.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 8 Oct 2014 20:06:21 +0000 (22:06 +0200)]
Merge commit '
147f2e91eece6b9021ff5b7f8a3b5ce053566659 '
* commit '
147f2e91eece6b9021ff5b7f8a3b5ce053566659 ':
avcodec: make sure color_range is properly initialized
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 8 Oct 2014 19:58:42 +0000 (21:58 +0200)]
Merge commit '
04d14c9b68b03e8dbc6e3003c1ee06892dd32576 '
* commit '
04d14c9b68b03e8dbc6e3003c1ee06892dd32576 ':
vc1: Split the decoder in components
Conflicts:
libavcodec/Makefile
libavcodec/vc1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 8 Oct 2014 19:45:41 +0000 (21:45 +0200)]
Merge commit '
7ae9791b641d1183910b6e7faca23f7ae08f8579 '
* commit '
7ae9791b641d1183910b6e7faca23f7ae08f8579 ':
avformat: bump version after mime_type change
Conflicts:
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 8 Oct 2014 19:35:40 +0000 (21:35 +0200)]
Merge commit '
b15b06ebf582ae81e47d236524c9ad6e10c8a0a7 '
* commit '
b15b06ebf582ae81e47d236524c9ad6e10c8a0a7 ':
avformat: use const char* instead of uint8_t* for AVProbeData.mime_type
Conflicts:
libavformat/format.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 8 Oct 2014 18:23:40 +0000 (20:23 +0200)]
avformat/matroskadec: do not trust the default duration to be the real 1/timebase if its less than 5fps
Fixes Ticket3980
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Vittorio Giovara [Fri, 26 Sep 2014 13:37:40 +0000 (14:37 +0100)]
dump: split audio and video probing on multiple lines
Also always report pixel format.
Vittorio Giovara [Fri, 26 Sep 2014 13:15:25 +0000 (14:15 +0100)]
pixdesc: return color properties names
Vittorio Giovara [Fri, 26 Sep 2014 12:14:37 +0000 (13:14 +0100)]
pixfmt: mark further reserved values
Vittorio Giovara [Mon, 29 Sep 2014 13:27:47 +0000 (14:27 +0100)]
doc: expand description for some color properties
Vittorio Giovara [Fri, 3 Oct 2014 17:18:55 +0000 (18:18 +0100)]
avprobe: print color properties for show_streams
Vittorio Giovara [Fri, 26 Sep 2014 15:07:55 +0000 (16:07 +0100)]
avcodec: make sure color_range is properly initialized
Luca Barbato [Wed, 16 Jul 2014 18:18:20 +0000 (20:18 +0200)]
vc1: Split the decoder in components
Speed up the overall compilation time.
Vittorio Giovara [Wed, 8 Oct 2014 14:52:51 +0000 (15:52 +0100)]
avformat: bump version after mime_type change
Tobias Rapp [Wed, 8 Oct 2014 07:59:23 +0000 (09:59 +0200)]
Changelog: add "ffprobe -show_pixel_formats option"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Fri, 3 Oct 2014 10:59:14 +0000 (12:59 +0200)]
tests/Makefile: Fix fate-ffprobe with --target-path
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andreas Cadhalpun [Tue, 30 Sep 2014 10:40:36 +0000 (11:40 +0100)]
avformat: use const char* instead of uint8_t* for AVProbeData.mime_type
This makes the field consistent with AVInputFormat.mime_type and the
argument type of av_match_name.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Michael Niedermayer [Wed, 8 Oct 2014 14:09:31 +0000 (16:09 +0200)]
avcodec/avpicture: use av_freep(), do not leave stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 8 Oct 2014 14:09:05 +0000 (16:09 +0200)]
avcodec/atrac3plusdec: use av_freep(), do not leave stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 8 Oct 2014 14:08:28 +0000 (16:08 +0200)]
avcodec/bfi: use av_freep(), do not leave stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 8 Oct 2014 13:22:24 +0000 (15:22 +0200)]
ffserver: use av_freep(), do not leave stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 8 Oct 2014 13:17:08 +0000 (15:17 +0200)]
avcodec/vorbisdec: use av_freep(), do not leave stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 8 Oct 2014 09:48:46 +0000 (11:48 +0200)]
Merge commit '
2d91abade29e43bb45c881d45909b8ee77e904e2 '
* commit '
2d91abade29e43bb45c881d45909b8ee77e904e2 ':
x86: h264_intrapred: Don't treat 32-bit integers as 64-bit
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 8 Oct 2014 09:39:28 +0000 (11:39 +0200)]
Merge commit '
82f8eb5f773d87e3d9c0066ef19b501a461ddfae '
* commit '
82f8eb5f773d87e3d9c0066ef19b501a461ddfae ':
jpeg2000: split off inverse MCT as Jpeg2000DSP
Conflicts:
libavcodec/Makefile
libavcodec/jpeg2000dec.c
libavcodec/jpeg2000dsp.c
libavcodec/jpeg2000dsp.h
See:
c9f2ec8a3464718641742a105179f828ccbfb392
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Henrik Gramner [Wed, 1 Oct 2014 17:03:29 +0000 (19:03 +0200)]
x86: h264_intrapred: Don't treat 32-bit integers as 64-bit
The upper halves are not guaranteed to be zero in x86-64.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
James Almer [Thu, 2 Oct 2014 17:08:01 +0000 (14:08 -0300)]
jpeg2000: split off inverse MCT as Jpeg2000DSP
This makes the addition of arch optimized functions easier.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Michael Niedermayer [Wed, 8 Oct 2014 02:23:03 +0000 (04:23 +0200)]
avcodec/h264: Undefined behavior (left shift of
12852653 by 8 places cannot be represented in type 'int')
Fixes: asan_heap-oob_84f75d_8_asan_heap-oob_a2a00a_341_mbc.ts
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 8 Oct 2014 02:18:27 +0000 (04:18 +0200)]
swresample/audioconvert: Fix undefined behavior (left shift of negative value)
Fixes: asan_heap-oob_4da4f3_8_asan_heap-oob_4da4f3_419_scene1a.mm
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 8 Oct 2014 02:12:26 +0000 (04:12 +0200)]
avcodec/mmvideo: Fix undefined behavior (left shift of negative value)
Fixes: asan_heap-oob_4da4f3_8_asan_heap-oob_4da4f3_419_scene1a.mm
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Tobias Rapp [Mon, 15 Sep 2014 15:16:03 +0000 (17:16 +0200)]
ffprobe: add pixel format chroma sub-sampling output
Adds output of chroma sub-sampling information to
ffprobe -show_pixel_formats option.
Note: This patch just prints the "raw" log2_charoma_w/h values instead
of the previously suggested mapping into a chroma sub-sampling pattern
string like "4:2:2".
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Tobias Rapp [Mon, 15 Sep 2014 15:15:42 +0000 (17:15 +0200)]
ffprobe: add pixel format component bit depth output
Adds output of bit depth per pixel format component to
ffprobe -show_pixel_formats option.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Tobias Rapp [Mon, 15 Sep 2014 15:15:17 +0000 (17:15 +0200)]
ffprobe: add pixel format flags output
Adds output of pixel format flags to ffprobe -show_pixel_formats option.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Tobias Rapp [Thu, 11 Sep 2014 07:16:52 +0000 (09:16 +0200)]
ffprobe: add -show_pixel_formats option
Adds option -show_pixel_formats to ffprobe which lists all
available pixel formats with some details.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Mon, 6 Oct 2014 11:04:26 +0000 (13:04 +0200)]
avfilter: add w/h parameters in timeline
Fixes Ticket #4008.
Michael Niedermayer [Tue, 7 Oct 2014 11:44:26 +0000 (13:44 +0200)]
avformat/tiertexseq: use av_freep(), do not leave stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 7 Oct 2014 11:44:26 +0000 (13:44 +0200)]
avfilter/af_adelay: use av_freep(), do not leave stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 7 Oct 2014 10:49:38 +0000 (12:49 +0200)]
Merge commit '
9a03c2323593173a201cb75edd1b49887cf811ed '
* commit '
9a03c2323593173a201cb75edd1b49887cf811ed ':
h263dec: Force padding bug workaround for H.263.
This is not merged as it breaks a good part of the error concealment/resilience for H.263
Also, messenger.h263 plays fine in ffmpeg.
If anyone has any other h263 files that do not work, please open an issue on trak or
mail me!
See:
d225b0f7aaa65eafccc87165130e1c4bab71708b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 7 Oct 2014 10:29:07 +0000 (12:29 +0200)]
Merge commit '
d208d1eba3799c58fd6d3602d31de3e686f14aec '
* commit '
d208d1eba3799c58fd6d3602d31de3e686f14aec ':
hevc_mvs: make sure to always initialize the temporal MV fully
Conflicts:
libavcodec/hevc_mvs.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 7 Oct 2014 10:10:50 +0000 (12:10 +0200)]
Merge commit '
79a60c8e779242b5ba4c531b2c706c871e8e6420 '
* commit '
79a60c8e779242b5ba4c531b2c706c871e8e6420 ':
hevc_mvs: initialize the temporal MV in case of missing ref
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Josh Allmann [Fri, 3 Oct 2014 16:42:25 +0000 (09:42 -0700)]
h263dec: Force padding bug workaround for H.263.
Fixes decoding of http://samples.mplayerhq.hu/V-codecs/h263/h263-raw/messenger.h263
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Anton Khirnov [Mon, 29 Sep 2014 16:25:14 +0000 (16:25 +0000)]
hevc_mvs: make sure to always initialize the temporal MV fully
The spec requires this.
Fixes uninitialized reads on some samples.
Remove now unnecessary initialization of the whole merge candidate list.
Anton Khirnov [Mon, 29 Sep 2014 16:16:50 +0000 (16:16 +0000)]
hevc_mvs: initialize the temporal MV in case of missing ref
The caller expects the MV to always be initialized.
Michael Niedermayer [Tue, 7 Oct 2014 02:29:27 +0000 (04:29 +0200)]
avformat/hls: use av_freep(), do not leave stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 7 Oct 2014 01:40:57 +0000 (03:40 +0200)]
avcodec/escape124: use av_freep(), do not leave stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 7 Oct 2014 01:40:57 +0000 (03:40 +0200)]
avcodec/proresenc_kostya: use av_freep(), do not leave stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 7 Oct 2014 01:40:57 +0000 (03:40 +0200)]
avcodec/avpacket: use av_freep(), do not leave stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 7 Oct 2014 01:40:15 +0000 (03:40 +0200)]
avcodec/avpacket: simplify freeing pkt->data
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Mark Reid [Sun, 5 Oct 2014 00:42:51 +0000 (17:42 -0700)]
avformat/mxfdec: read reel_name and source timecode from physical source package
Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 7 Oct 2014 00:51:08 +0000 (02:51 +0200)]
Merge commit '
28816050e47b6dba430a52e429d21a864cffda8e '
* commit '
28816050e47b6dba430a52e429d21a864cffda8e ':
lavf: Set the stream time base hint properly for chained muxers
Conflicts:
libavformat/segment.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 7 Oct 2014 00:39:58 +0000 (02:39 +0200)]
Merge commit '
b76249443864c88ffb2d41ab8d1de7432e985dc7 '
* commit '
b76249443864c88ffb2d41ab8d1de7432e985dc7 ':
sdp: Simplify parsing/conversion of H264 extradata
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 7 Oct 2014 00:15:07 +0000 (02:15 +0200)]
Merge commit '
153fadc390d05aa47e5e2c56290401898fe41a23 '
* commit '
153fadc390d05aa47e5e2c56290401898fe41a23 ':
ff_get_format: fix infinite loop
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Mon, 6 Oct 2014 08:41:33 +0000 (11:41 +0300)]
lavf: Set the stream time base hint properly for chained muxers
This avoids warnings about using the codec time base as time
base hint.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Fri, 3 Oct 2014 17:49:01 +0000 (20:49 +0300)]
sdp: Simplify parsing/conversion of H264 extradata
By using ff_avc_write_annexb_extradata instead of the h264_mp4toannexb
BSF, the code for doing the conversion itself is kept much shorter,
there's less state to restore at the end, we don't risk leaving the
AVCodecContext in an inconsistent state if returning early due to
errors, etc.
Also add a missing free if the base64 encoding fails.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Mon, 6 Oct 2014 19:08:55 +0000 (21:08 +0200)]
Merge commit '
577899a6458ccad9026eb268f10dc0b39c224c8d '
* commit '
577899a6458ccad9026eb268f10dc0b39c224c8d ':
lavc: specify the behavior of av_lockmgr_register on failure.
Conflicts:
libavcodec/avcodec.h
libavcodec/utils.c
libavcodec/version.h
See:
a950edb472e8823e34832c7313ba447b2db76f27
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Rémi Denis-Courmont [Mon, 6 Oct 2014 14:41:00 +0000 (17:41 +0300)]
ff_get_format: fix infinite loop
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Manfred Georg [Thu, 2 Oct 2014 20:19:34 +0000 (13:19 -0700)]
lavc: specify the behavior of av_lockmgr_register on failure.
The register function now specifies that the user callback should
leave things in the same state that it found them on failure but
that failure to destroy is ignored by the library. The register
function is now explicit about its behavior on failure
(it unregisters the previous callback and destroys all mutex).
Signed-off-by: Manfred Georg <mgeorg@google.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Michael Niedermayer [Mon, 6 Oct 2014 15:39:28 +0000 (17:39 +0200)]
avcodec/vdpau: do not dereference hwctx before checking it for NULL
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 6 Oct 2014 14:23:56 +0000 (16:23 +0200)]
Merge commit '
8de1d67967a9f9e22c66cb0c1e518ae4f30d07dd '
* commit '
8de1d67967a9f9e22c66cb0c1e518ae4f30d07dd ':
avconv_vdpau: update to new VDPAU interface
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 6 Oct 2014 14:23:36 +0000 (16:23 +0200)]
avcodec/vdpau: fix render2() check
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 6 Oct 2014 13:27:19 +0000 (15:27 +0200)]
ffmpeg: add vdpau_old to allow continued testing of the older (but not oldest) API
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 6 Oct 2014 13:11:46 +0000 (15:11 +0200)]
Merge commit '
bef067f88c74190cdf7e76d12f02e12e069974aa '
* commit '
bef067f88c74190cdf7e76d12f02e12e069974aa ':
vdpau: check video surface and decoder capabilities
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 6 Oct 2014 13:04:03 +0000 (15:04 +0200)]
Merge commit '
e3e158e81f0666b8fe66be9ce1cad63a535920e0 '
* commit '
e3e158e81f0666b8fe66be9ce1cad63a535920e0 ':
vdpau: add av_vdpau_bind_context()
Conflicts:
doc/APIchanges
libavcodec/vdpau.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 6 Oct 2014 12:17:40 +0000 (14:17 +0200)]
Merge commit '
502cde409ca5ee97ef70c2cdede88b9101746ff6 '
* commit '
502cde409ca5ee97ef70c2cdede88b9101746ff6 ':
vdpau: force reinitialization when output resolution changes
Conflicts:
libavcodec/vdpau.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 6 Oct 2014 12:10:37 +0000 (14:10 +0200)]
avcodec/vdpau: warn if the user application has not setup avctx->hwaccel_context instead of potentially crashing
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 6 Oct 2014 11:21:52 +0000 (13:21 +0200)]
Merge commit '
89ac99ba5f2dc9f69ad3bc294753930eb0b3e4a4 '
* commit '
89ac99ba5f2dc9f69ad3bc294753930eb0b3e4a4 ':
vdpau: pass codec-specific parameters from hwaccel
Conflicts:
libavcodec/vdpau.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 6 Oct 2014 10:47:08 +0000 (12:47 +0200)]
avcodec/vdpau_internal: add comment to #endif
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 6 Oct 2014 10:32:07 +0000 (12:32 +0200)]
Merge commit '
ce083282f0a8b7d63c4047c30b7bac498f9806dd '
* commit '
ce083282f0a8b7d63c4047c30b7bac498f9806dd ':
vdpau: common support for managing the VdpDecoder in avcodec
Conflicts:
libavcodec/vdpau.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 6 Oct 2014 10:04:25 +0000 (12:04 +0200)]
Merge commit '
fcc1022611f79c2f3aa2f392a5ce14c74be9c1d7 '
* commit '
fcc1022611f79c2f3aa2f392a5ce14c74be9c1d7 ':
vdpau: factor out common end-of-frame handling
Conflicts:
libavcodec/vdpau.c
libavcodec/vdpau_h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 6 Oct 2014 09:38:06 +0000 (11:38 +0200)]
Merge commit '
319424d25c53f82b87187ce03ed984d438f1bee6 '
* commit '
319424d25c53f82b87187ce03ed984d438f1bee6 ':
vdpau: add helper for VDPAU to libav error codes conversion
Conflicts:
libavcodec/vdpau.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Rémi Denis-Courmont [Sat, 4 Oct 2014 13:55:09 +0000 (16:55 +0300)]
avconv_vdpau: update to new VDPAU interface
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Rémi Denis-Courmont [Sat, 4 Oct 2014 13:55:08 +0000 (16:55 +0300)]
vdpau: check video surface and decoder capabilities
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Rémi Denis-Courmont [Sat, 4 Oct 2014 13:55:07 +0000 (16:55 +0300)]
vdpau: add av_vdpau_bind_context()
This function provides an explicit VDPAU device and VDPAU driver to
libavcodec, so that the application is relieved from codec specifics
and VdpDevice life cycle management.
A stub flags parameter is added for future extension. For instance, it
could be used to ignore codec level capabilities (if someone feels
dangerous).
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Rémi Denis-Courmont [Sat, 4 Oct 2014 13:55:06 +0000 (16:55 +0300)]
vdpau: force reinitialization when output resolution changes
This is necessary to recreate the decoder with the correct parameters,
as not all codecs invoke get_format() in this case.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Michael Niedermayer [Sun, 5 Oct 2014 23:29:15 +0000 (01:29 +0200)]
swresample/swresample: replace always true if() by av_assert0()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 5 Oct 2014 23:08:20 +0000 (01:08 +0200)]
swresample/swresample: fix sample drop loop end condition
Fixes Ticket3985
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 5 Oct 2014 21:31:37 +0000 (23:31 +0200)]
avformat/mov: do not overwrite extradata in mov_read_glbl()
Fixes regression from Ticket3962
This basically favors the first global header while since
34751f8313a41bf94e004ffa9491f35d96763558
it was the last. If this heuristic turns out worse, do not hesitate to revert this and
reopen 3962 as a feature request for multiple STSD
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Mon, 15 Sep 2014 00:46:20 +0000 (21:46 -0300)]
swscale: remove obsolete FF_API_SWS_FORMAT_NAME cruft
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 15 Sep 2014 00:28:09 +0000 (21:28 -0300)]
avformat: remove obsolete FF_API_READ_PACKET cruft
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 15 Sep 2014 00:26:51 +0000 (21:26 -0300)]
avformat: remove obsolete FF_API_CLOSE_INPUT_FILE cruft
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 15 Sep 2014 00:26:13 +0000 (21:26 -0300)]
avformat: remove obsolete FF_API_SET_PTS_INFO cruft
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 15 Sep 2014 00:25:26 +0000 (21:25 -0300)]
avformat: remove obsolete FF_API_NEW_STREAM cruft
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 15 Sep 2014 00:24:35 +0000 (21:24 -0300)]
avformat: remove obsolete FF_API_FORMAT_PARAMETERS cruft
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 15 Sep 2014 00:23:44 +0000 (21:23 -0300)]
avformat: remove obsolete FF_API_ALLOC_OUTPUT_CONTEXT cruft
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 15 Sep 2014 00:21:42 +0000 (21:21 -0300)]
avutil: remove obsolete FF_API_INTFLOAT cruft
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 15 Sep 2014 00:17:03 +0000 (21:17 -0300)]
avutil: remove obsolete FF_API_SAMPLES_UTILS_RETURN_ZERO cruft
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 15 Sep 2014 00:15:33 +0000 (21:15 -0300)]
avutil: remove obsolete FF_API_FIND_OPT cruft
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 15 Sep 2014 00:14:00 +0000 (21:14 -0300)]
avutil: remove obsolete FF_API_GET_BITS_PER_SAMPLE_FMT cruft
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Sun, 14 Sep 2014 23:56:06 +0000 (20:56 -0300)]
avcodec: remove obsolete FF_API_FAST_MALLOC cruft
Signed-off-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Sun, 5 Oct 2014 19:43:17 +0000 (21:43 +0200)]
avformat/options_table: add FF_COMPLIANCE_UNOFFICIAL
Fixes ticket 3959
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 4 Oct 2014 10:32:04 +0000 (12:32 +0200)]
configure: add -lrt to libavutil when needed for nanosleep
This is similar to
7d97511e13ef30cd99bae0e36400de055b72918d
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Benoit Fouet [Tue, 30 Sep 2014 11:06:40 +0000 (13:06 +0200)]
avcodec/h264_mp4toannexb_bsf: reset the new IDR flag when SPS/PPS is seen.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 5 Oct 2014 11:00:40 +0000 (13:00 +0200)]
avcodec/webp: add assert to ensure palette is not larger than 256
it should not be possible to be larger as its stored as 8bit value
but we would be overwriting a stack buffer if it is ...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Pascal Massimino [Mon, 22 Sep 2014 21:48:57 +0000 (14:48 -0700)]
avcodec/webp: add optimization: use local palette with extra padding
for big enough pictures.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Rémi Denis-Courmont [Sat, 4 Oct 2014 13:55:05 +0000 (16:55 +0300)]
vdpau: pass codec-specific parameters from hwaccel
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Rémi Denis-Courmont [Sat, 4 Oct 2014 13:55:04 +0000 (16:55 +0300)]
vdpau: common support for managing the VdpDecoder in avcodec
Using the not so new init and uninit callbacks, avcodec can now take
care of creating and destroying the VDPAU decoder instance.
The application is still responsible for creating the VDPAU device
and allocating video surfaces - this is necessary to keep video
surfaces on the GPU all the way to the output. But the application
will no longer needs to care about any codec-specific aspects.
Signed-off-by: Anton Khirnov <anton@khirnov.net>