33db99548b
Changelog: add "ffprobe -show_pixel_formats option"
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-10-08 16:58:14 +02:00
1d4480d376
tests/Makefile: Fix fate-ffprobe with --target-path
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-10-08 16:26:20 +02:00
f703c8cc09
avcodec/avpicture: use av_freep(), do not leave stale pointers in memory
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-10-08 16:09:31 +02:00
fa8c6c1350
avcodec/atrac3plusdec: use av_freep(), do not leave stale pointers in memory
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-10-08 16:09:23 +02:00
f66fed6c42
avcodec/bfi: use av_freep(), do not leave stale pointers in memory
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-10-08 16:08:28 +02:00
e97f38ce63
ffserver: use av_freep(), do not leave stale pointers in memory
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-10-08 15:22:24 +02:00
b530e2e351
avcodec/vorbisdec: use av_freep(), do not leave stale pointers in memory
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-10-08 15:17:27 +02:00
3c1378ce0a
Merge commit '2d91abade29e43bb45c881d45909b8ee77e904e2'
...
* commit '2d91abade29e43bb45c881d45909b8ee77e904e2':
x86: h264_intrapred: Don't treat 32-bit integers as 64-bit
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-10-08 11:48:58 +02:00
36e4b750a7
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: c9f2ec8a34michaelni@gmx.at >
2014-10-08 11:40:56 +02:00
2d91abade2
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 >
2014-10-08 08:15:52 +00:00
82f8eb5f77
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 >
2014-10-08 08:02:55 +00:00
f3296b9454
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 >
2014-10-08 05:35:10 +02:00
344f8d307a
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 >
2014-10-08 05:35:06 +02:00
9db9b209e3
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 >
2014-10-08 05:35:01 +02:00
1acc9189b4
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 >
2014-10-07 23:18:15 +02:00
7d327d6242
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 >
2014-10-07 23:18:15 +02:00
b36b2c89df
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 >
2014-10-07 23:18:15 +02:00
143a8a44f4
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 >
2014-10-07 23:18:15 +02:00
abaf4245a1
avfilter: add w/h parameters in timeline
...
Fixes Ticket #4008 .
2014-10-07 15:05:50 +02:00
158b3fb584
avformat/tiertexseq: use av_freep(), do not leave stale pointers in memory
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-10-07 13:46:29 +02:00
2d6f31730c
avfilter/af_adelay: use av_freep(), do not leave stale pointers in memory
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-10-07 13:44:26 +02:00
aba873bbd0
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: d225b0f7aamichaelni@gmx.at >
2014-10-07 13:00:08 +02:00
33c8500db4
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 >
2014-10-07 12:29:07 +02:00
018ca8b7f6
Merge commit '79a60c8e779242b5ba4c531b2c706c871e8e6420'
...
* commit '79a60c8e779242b5ba4c531b2c706c871e8e6420':
hevc_mvs: initialize the temporal MV in case of missing ref
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-10-07 12:21:43 +02:00
9a03c23235
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 >
2014-10-07 07:30:32 +00:00
d208d1eba3
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.
2014-10-07 07:13:01 +00:00
79a60c8e77
hevc_mvs: initialize the temporal MV in case of missing ref
...
The caller expects the MV to always be initialized.
2014-10-07 07:12:55 +00:00
0026c4ecfd
avformat/hls: use av_freep(), do not leave stale pointers in memory
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-10-07 04:29:27 +02:00
f0d1b3acdf
avcodec/escape124: use av_freep(), do not leave stale pointers in memory
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-10-07 03:42:20 +02:00
1c5647f419
avcodec/proresenc_kostya: use av_freep(), do not leave stale pointers in memory
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-10-07 03:41:40 +02:00
c9eac8062e
avcodec/avpacket: use av_freep(), do not leave stale pointers in memory
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-10-07 03:40:57 +02:00
b60938e4fd
avcodec/avpacket: simplify freeing pkt->data
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-10-07 03:40:15 +02:00
5c50214eed
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 >
2014-10-07 03:13:06 +02:00
3726d07a2a
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 >
2014-10-07 02:51:08 +02:00
4db0e8fd33
Merge commit 'b76249443864c88ffb2d41ab8d1de7432e985dc7'
...
* commit 'b76249443864c88ffb2d41ab8d1de7432e985dc7':
sdp: Simplify parsing/conversion of H264 extradata
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-10-07 02:40:02 +02:00
a52384dcda
Merge commit '153fadc390d05aa47e5e2c56290401898fe41a23'
...
* commit '153fadc390d05aa47e5e2c56290401898fe41a23':
ff_get_format: fix infinite loop
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-10-07 02:15:26 +02:00
28816050e4
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 >
2014-10-06 23:30:52 +03:00
b762494438
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 >
2014-10-06 23:29:58 +03:00
d47dd84391
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: a950edb472michaelni@gmx.at >
2014-10-06 21:08:55 +02:00
153fadc390
ff_get_format: fix infinite loop
...
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2014-10-06 18:39:45 +00:00
577899a645
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 >
2014-10-06 18:20:17 +00:00
67ddf21611
avcodec/vdpau: do not dereference hwctx before checking it for NULL
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-10-06 17:39:28 +02:00
4d8356b678
Merge commit '8de1d67967a9f9e22c66cb0c1e518ae4f30d07dd'
...
* commit '8de1d67967a9f9e22c66cb0c1e518ae4f30d07dd':
avconv_vdpau: update to new VDPAU interface
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-10-06 16:31:51 +02:00
0e57c05118
avcodec/vdpau: fix render2() check
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-10-06 16:23:36 +02:00
403133ab5e
ffmpeg: add vdpau_old to allow continued testing of the older (but not oldest) API
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-10-06 16:09:02 +02:00
573d333010
Merge commit 'bef067f88c74190cdf7e76d12f02e12e069974aa'
...
* commit 'bef067f88c74190cdf7e76d12f02e12e069974aa':
vdpau: check video surface and decoder capabilities
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-10-06 15:12:19 +02:00
a61899a0f1
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 >
2014-10-06 15:04:03 +02:00
067d11bf71
Merge commit '502cde409ca5ee97ef70c2cdede88b9101746ff6'
...
* commit '502cde409ca5ee97ef70c2cdede88b9101746ff6':
vdpau: force reinitialization when output resolution changes
Conflicts:
libavcodec/vdpau.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-10-06 14:17:40 +02:00
ec6a855b3a
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 >
2014-10-06 14:10:37 +02:00
0ba887bbf4
Merge commit '89ac99ba5f2dc9f69ad3bc294753930eb0b3e4a4'
...
* commit '89ac99ba5f2dc9f69ad3bc294753930eb0b3e4a4':
vdpau: pass codec-specific parameters from hwaccel
Conflicts:
libavcodec/vdpau.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2014-10-06 13:21:52 +02:00
Tobias Rapp