Michael Niedermayer
ef2a85ac53
Merge commit 'aa9d15d89bb4ee8a31607d3db1b8c5334eb88d2d'
...
* commit 'aa9d15d89bb4ee8a31607d3db1b8c5334eb88d2d':
qsvdec: avoid an infinite loop with no consumed data and no output
Conflicts:
libavcodec/qsvdec.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-25 23:10:14 +02:00
Michael Niedermayer
c105e0f077
avcodec/aacps_fixed_tablegen: change f_center to 64bit to avoid overflow
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-25 22:07:41 +02:00
Michael Niedermayer
e171309756
avutil/softfloat: Add a test for av_sincos_sf()
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-25 21:42:42 +02:00
Ivan Uskov
fb57bc6c34
avcodec: Add QSV VC-1 video decoder.
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-25 19:32:22 +02:00
Michael Niedermayer
7ec5115409
avformat/nutenc: Omit AV_PKT_DATA_QUALITY_STATS when storing side data.
...
This side data does not serve or improve decoding the data, it thus
would semantically be metadata and not side data.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-25 18:39:17 +02:00
Anton Khirnov
41d47ea85f
lavc: add Intel libmfx-based HEVC decoder.
2015-07-25 17:37:01 +02:00
Anton Khirnov
bf52f77391
lavc: add Intel libmfx-based MPEG2 decoder.
2015-07-25 17:36:59 +02:00
Ivan Uskov
6d0123f40e
avcodec: Add QSV MPEG-2 video decoder.
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-25 17:31:18 +02:00
Anton Khirnov
f89f78c1c5
lavc: add a HEVC mp4->annex B bitstream filter
2015-07-25 17:26:53 +02:00
Anton Khirnov
96dca089b1
qsvdec: move qsv_process_data() from qsvdec_h264 to the common code
...
It will be shared with the upcoming mpeg2 and hevc decoders.
2015-07-25 17:24:25 +02:00
Anton Khirnov
fa85fcf2b7
qsvenc_hevc: fix enum declaration
...
Declare a named enum, not a variable with anonymous enum type.
2015-07-25 17:24:03 +02:00
Anton Khirnov
22522d9c2c
qsvdec: fix a memleak of async_fifo
...
init() is called whenever format changes, so current code would leak the
fifo in this case.
2015-07-25 17:23:46 +02:00
Anton Khirnov
aa9d15d89b
qsvdec: avoid an infinite loop with no consumed data and no output
...
This is triggerable with the HEVC decoder. It is unclear yet whether the
bug is in the calling code or the MSDK, but it seems better to check for
this in any case.
2015-07-25 17:23:29 +02:00
Michael Niedermayer
38490e0724
avcodec/dvdec: only attempt to conceal errors based on STA inconsistencies when error_concealment is set
...
This allows the user to disable it in the hypothetical case that STA values are wrong
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-25 15:27:44 +02:00
Michael Niedermayer
bbad3811cc
avcodec/aacps: Fix ;;
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-25 14:07:55 +02:00
Michael Niedermayer
f267d553f7
avcodec/aactab: Add ff_aac_eld_window_480_fixed
...
Fixes pointer type mismatch
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-25 13:59:53 +02:00
Michael Niedermayer
17cc35c76b
avcodec/aactab: Fix rounding of elements in ff_aac_eld_window_512_fixed
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-25 13:19:06 +02:00
Michael Niedermayer
1909a9151c
swscale/output: Fix "warning: assignment from incompatible pointer type"
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-25 03:15:56 +02:00
Zhang Rui
8a17335189
avformat/async: wake up main thread before exit background thread
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-25 02:26:01 +02:00
Zhang Rui
c0a4af408e
avformat/async: move more code into locked area in background thread
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-25 01:43:44 +02:00
Michael Niedermayer
dee551bbd2
avcodec/dvdec: skip 3rd stage ac decoding when the headers indicates that the data is inconsistent
...
Fixes Ticket1589
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-25 00:27:38 +02:00
Shivraj Patil
e21b090bfb
avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for VP9 intra functions
...
Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-24 22:51:34 +02:00
Hendrik Leppkes
0c0cd34f9c
configure: fix LARGEADDRESSAWARE flag with MSVC
...
Otherwise it would get translated like a library path (-L option),
which breaks setting the flag.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-24 21:56:10 +02:00
James Almer
ede590c84d
avcodec/aacsbr: add missing header include
...
Fixes make checkheaders
Signed-off-by: James Almer <jamrial@gmail.com>
2015-07-24 16:27:52 -03:00
Michael Niedermayer
dae79a185f
Merge commit 'c9edbe4af901e9bc9f05a62319637f9760df9a4a'
...
* commit 'c9edbe4af901e9bc9f05a62319637f9760df9a4a':
use a wrapper script to call MS link.exe to avoid mixing with /usr/bin/link.exe
See: 58ed7b6328
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-24 20:02:48 +02:00
Steve Lhomme
58ed7b6328
use a wrapper script to call MS link.exe to avoid mixing with /usr/bin/link.exe
...
favor link over link.exe in case some wrapper script already exists
fallback to "link" in the path if the one next to cl is not found
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-24 20:02:32 +02:00
Michael Niedermayer
daf6bce71b
avcodec/dvdec: Retry decoding seemingly damaged MBs while skiping likely damaged parts
...
Improves decoding of Ticket1589
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-24 17:36:00 +02:00
Steve Lhomme
c9edbe4af9
use a wrapper script to call MS link.exe to avoid mixing with /usr/bin/link.exe
...
Fallback to "link" in the path if the one next to cl is not found.
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-07-24 18:21:22 +03:00
Paul B Mahol
3cb8eee6f7
swscale: ayuv64le output support
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-07-24 03:45:48 +00:00
Paul B Mahol
052f64ecb2
swscale: ayuv64le input support
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-07-24 03:44:58 +00:00
Paul B Mahol
f0489a35c0
avutil: add ayuv64le and ayuv64be packed pixel format
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-07-24 03:40:36 +00:00
Paul B Mahol
44fb00866f
avfilter: rename vf_reverse.c to f_reverse.c
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-07-24 02:09:53 +00:00
Paul B Mahol
591741b51d
avfilter: add areverse filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-07-24 02:06:48 +00:00
Ivan Uskov
0b159e3b65
libavcodec/qsvdec_h264.c: packet buffering has been removed since qsvdec.c does maintain own data buffering now.
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-24 13:03:42 +02:00
Ivan Uskov
c90dbc67ed
libavcodec/qsvdec.c: The ff_qsv_decode() now guarantees the consumption of whole packet.
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-24 12:46:55 +02:00
Michael Niedermayer
5da90d7ec3
avcodec/hapdec: Check that there is sufficient input data
...
Fixes Ticket4729
Found-by: ami_stuff
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-24 04:40:15 +02:00
Michael Niedermayer
da8b70b810
Merge commit 'a54e720e0289433d6bc3f7ba0a37fa5cabfaeea9'
...
* commit 'a54e720e0289433d6bc3f7ba0a37fa5cabfaeea9':
configure: force -nologo- when detecting MSVC
Conflicts:
configure
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-24 00:44:58 +02:00
Michael Niedermayer
c6965f62a2
Merge commit '44f7df0c987965763c609f6dc36974b04182e58d'
...
* commit '44f7df0c987965763c609f6dc36974b04182e58d':
dds: Write the palette in the native endian form
Conflicts:
libavcodec/dds.c
See: 36a87c2dc7
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-23 21:30:28 +02:00
Steve Lhomme
a54e720e02
configure: force -nologo- when detecting MSVC
...
The -nologo- option is the inverse of -nologo, reenabling printing the
"logo" version header. This is useful if the compiler actually is a
wrapper that forces -nologo.
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-07-23 22:28:08 +03:00
Tom Butterworth
64539e1213
avcodec/hap: (trivial) rename enum values and document their meaning
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-23 20:59:57 +02:00
Tom Butterworth
26e8247c1c
avcodec/hap: (trivial) clarify comment
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-23 20:57:52 +02:00
Martin Storsjö
44f7df0c98
dds: Write the palette in the native endian form
...
This fixes the palette on big endian, broken (or, differing from
little endian) since 57214b2f7
.
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-07-23 19:07:43 +03:00
Tom Butterworth
11f3d5c69b
hap: Name enums, remove unused struct member
2015-07-23 13:35:16 +01:00
Tom Butterworth
083cbc930d
snappy: Refactor so ff_snappy_uncompress() uses an existing buffer
...
Some uses of Snappy require uncompressing to positions within
an existing buffer. Also adds a function to get the uncompressed
length of Snappy data.
2015-07-23 13:35:16 +01:00
Alexandra Hájková
7f388c0fab
asfdec: remove the wrong condition
...
this condition breaks reading from the pipe as data_reached variable
have to be set to break while in the asf_read_header just after the Data
Object is found
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2015-07-23 10:50:27 +02:00
Tom Butterworth
ae5a8dca67
hap: Fix slice size computation
...
A bug was introduced in 977105407c
whereby when
frame height wasn't divisible by the number of threads, pixels would be omitted
from the bottom rows during decode.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-07-23 10:46:19 +02:00
Tom Butterworth
ebe8b5d947
dds: Fix the slice size computation
...
A bug was introduced in 6b2b26e7af
whereby when
frame height wasn't divisible by the number of threads, pixels would be omitted
from the bottom rows during decode.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-07-23 10:45:40 +02:00
Anton Khirnov
22ecfcd4c7
af_channelmap: properly set the supported output channel layouts
...
The current code expects query_formats() to be called exactly once, it
will leak if it's not called at all (filter initialized, but never
configured or used) or try to read freed memory if it's called more than
once.
Found-by: James Almer <jamrial@gmail.com>
CC: libav-stable@libav.org
2015-07-23 09:53:55 +02:00
Alexandra Hájková
aed7715b8f
asfdec: increment nb_streams right after the stream allocation
...
to prevent possible memory leaks
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2015-07-23 09:48:26 +02:00
Alexandra Hájková
ee80f834cb
asfdec: set nb_streams to 0 in the asf_read_close
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2015-07-23 09:47:59 +02:00