Michael Niedermayer
55231323b0
Merge commit '254f3daba4271c1918d9a7ad155b1442ef93ed29'
...
* commit '254f3daba4271c1918d9a7ad155b1442ef93ed29':
nut: Make sure to clean up on read_header failure
Conflicts:
libavformat/nutdec.c
See: 361702660d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-10 22:31:39 +02:00
Michael Niedermayer
73b8155b31
Merge commit '4d0ee4962be7e07cdc038a78008ef2e4e47e5f81'
...
* commit '4d0ee4962be7e07cdc038a78008ef2e4e47e5f81':
avi: Validate sample_size
Conflicts:
libavformat/avidec.c
See: ca234639ac
See: c7369f3a4b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-10 22:20:37 +02:00
Michael Niedermayer
8b0ceb96da
Merge commit 'b34257eefd98cb768ea2f53a390b8684d51e689a'
...
* commit 'b34257eefd98cb768ea2f53a390b8684d51e689a':
nut: Check chapter creation in decode_info_header
Conflicts:
libavformat/nutdec.c
See: 3ff1af2b0d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-10 22:09:48 +02:00
Michael Niedermayer
ce1c0e99e9
Merge commit '243e8443cd9e83c887e3f5edf09a169e7783d14e'
...
* commit '243e8443cd9e83c887e3f5edf09a169e7783d14e':
alac: Reject rice_limit 0 if compression is used
Conflicts:
libavcodec/alac.c
See: 4b657a1b1e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-10 22:00:40 +02:00
Michael Niedermayer
918c5ea4d3
Merge commit '295e05a762332c5edcc84c325e94457815a51b5c'
...
* commit '295e05a762332c5edcc84c325e94457815a51b5c':
ape: Support _0000 files with nblock smaller than 64
Conflicts:
libavcodec/apedec.c
See: 699341d647
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-10 21:42:08 +02:00
Michael Niedermayer
004564c930
avformat/wavenc: Check umid length
...
Fixes potential out of array read
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-10 20:03:36 +02:00
Michael Niedermayer
ecb4ae7879
avformat/wavenc: fix string length variable types
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-10 19:52:30 +02:00
Michael Niedermayer
d0b294286c
avcodec/ppc/h264qpel_template: Fix alignment assert
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-10 18:09:39 +02:00
Michael Niedermayer
07cb6bf985
postproc/postprocess: Use size_t to hold strlen()s value
...
This should make no difference but its more correct
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-10 16:28:37 +02:00
Michael Niedermayer
d66b623ad0
avformat/nutenc: Fix writing strings larger than 2gb
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-10 16:26:58 +02:00
Michael Niedermayer
4c128ea162
avutil/dict: Use size_t for appending strings
...
the string length is not constrained to INT_MAX
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-10 16:09:07 +02:00
Michael Niedermayer
4950bd4ebe
libavutil/mem: use size_t for the length in av_strdup()
...
the string length is not constrained to INT_MAX
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-10 16:06:50 +02:00
Michael Niedermayer
54e64eaf68
swscale/x86/swscale: Fix warning about loosing significant bits in cast
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-10 15:09:04 +02:00
Michael Niedermayer
a649f36f75
avformat/http: Mark lower_proto as const in http_listen()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-10 15:01:36 +02:00
Michael Niedermayer
3d65570f25
avformat/mxf: Always evaluate PRINT_KEY() arguments at compile time
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-10 14:39:27 +02:00
Michael Niedermayer
8b42b22222
avformat/mxf: Simplify PRINT_KEY()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-10 14:39:26 +02:00
Michael Niedermayer
729108515d
avcodec/snowenc: set dia_size for the first pass of motion estimation too
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-10 14:19:56 +02:00
Reimar Döffinger
5af621278d
avformat_alloc_context: initialize raw_packet_buffer_remaining_size.
...
This currently works for most users because
avformat_open_input sets it, but this patch fixes any
applications not using that function.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2015-05-10 08:47:53 +02:00
Michael Niedermayer
58201c6e9e
avcodec/snowenc: correct fullpel search pattern
...
No real difference in quality, its a bit slower for the same dia_size as more
vectors are searched for the same dia_size
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-10 02:38:05 +02:00
Michael Niedermayer
db6d0a5bd2
avcodec/snowenc: Fix used reference MV in fullpel iterative ME
...
This very very slightly improves quality, no measurable speed change
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-10 01:05:42 +02:00
Michael Niedermayer
f349703e1d
avcodec/snowenc: change log level for iterative ME information to debug level
...
The printed stuff should be useless to the average user and its certainly
not an error.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-10 00:46:02 +02:00
Michael Niedermayer
b62297805b
avcodec/snowenc: add intra_penalty AVOption
...
This allows favoring intra or inter blocks by a user specified amount.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-09 23:52:36 +02:00
Michael Niedermayer
cf31e2df08
avcodec/mpegvideo: Fix null pointer dereference with grayscale decoding with mpeg2_field_encoding.ts
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-09 17:10:26 +02:00
Michael Niedermayer
33529104e5
avcodec/mpeg12dec: Fix "-flags +gray"
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-09 15:58:02 +02:00
Luca Barbato
254f3daba4
nut: Make sure to clean up on read_header failure
...
Based on Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> work.
CC: libav-stable@libav.org
2015-05-09 15:55:50 +02:00
Andreas Cadhalpun
4d0ee4962b
avi: Validate sample_size
...
And either error out or set it to 0 if it is negative.
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-05-09 15:51:31 +02:00
Michael Niedermayer
876c89a88f
cmdline: Check options array for not working flag combinations
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-09 13:07:21 +02:00
Michael Niedermayer
107e4da476
ffmpeg_opt: Fix -timestamp parsing
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-09 13:07:00 +02:00
Michael Niedermayer
9ba5dd37a9
avcodec/mpegvideo: Fix indention
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-09 12:03:36 +02:00
Michael Niedermayer
5c8809b45b
avcodec/error_resilience: support grayscale
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-09 02:42:47 +02:00
Michael Niedermayer
82a6e18bbb
avcodec/mpegvideo: Fix -flags +gray with xvid_vlc_trac7411.h263
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-09 01:36:53 +02:00
Michael Niedermayer
9025bc588a
avcodec/h263dec: use PIX_FMT_GRAY8 when the user specified CODEC_FLAG_GRAY
...
Fixes Ticket4542
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-09 01:13:55 +02:00
Michael Niedermayer
d1d8ee5e91
avdevice/v4l2: Try to fix build on netbsd/openbsd
...
Found-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-09 00:27:00 +02:00
Giorgio Vazzana
28f20d2ff4
lavd/v4l2: produce a 0 byte packet when a dequeued buffer is flagged with V4L2_BUF_FLAG_ERROR
...
Fixes ticket #4030 .
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-08 22:31:09 +02:00
Michael Niedermayer
982e7bbfa6
avcodec/vc1: Skip chroma operations if CODEC_FLAG_GRAY is set
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-08 20:32:15 +02:00
Giorgio Vazzana
23e6cf832f
lavd/v4l2: fix typo
...
This was introduced in cde6e328de
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-08 18:02:28 +02:00
Ronald S. Bultje
c97d30f02f
vp9: de-duplicate some functions that are identical between 10/12 bpp.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-08 14:42:01 +02:00
周晓勇
ba1f56ae9b
configure: remove loongson check inline asm and mips dependent
...
1.Loongson now have two series CPU supported MMI(Multi-Media Instruct).
Loongson-3 designed multi-core have good performance in decoding.
Loongson-2's support is comming soon.
2.Replaced loongson with loongson2 and loongson3.
Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-08 14:33:40 +02:00
周晓勇
b6d8afd820
configure: replace arch loongson with arch extra list loongson
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-08 14:01:38 +02:00
Andreas Cadhalpun
b34257eefd
nut: Check chapter creation in decode_info_header
...
This fixes a segmentation fault when accessing the metadata.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
CC: libav-stable@libav.org
2015-05-08 11:10:51 +02:00
Andreas Cadhalpun
243e8443cd
alac: Reject rice_limit 0 if compression is used
...
If in compression mode rice_limit = 0 leads to call
`show_bits(gb, k)` in `decode_scalar` with k = 0.
Request a sample in case it is valid and it should be accepted.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
CC: libav-stable@libav.org
2015-05-08 11:10:51 +02:00
Andreas Cadhalpun
295e05a762
ape: Support _0000 files with nblock smaller than 64
...
The decode_array_0000 assumed that 64 is the minimal block size
while it is not.
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-05-08 11:10:51 +02:00
wm4
b697b297b7
id3v2: do not export APIC description if empty
...
APIC tags always have a description. Tag writers obviously leave it
empty if there is no description. In this case, libavformat would export
"" as title. Do not set the title instead.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-08 01:07:13 +02:00
wm4
72e7553125
pngdec: set correct range
...
AV_PIX_FMT_GRAY8/16 are considered YUV formats, and the color_range is
not set - so the API user will have to assume limitted range. (Unless
the API user adds a special-case for the PNG decoder.)
Just export the correct range - full range.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-08 00:44:06 +02:00
Michael Niedermayer
3b12335395
swscale/x86/hscale_fast_bilinear_simd: Remove ancient out-commented debug code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-07 23:58:08 +02:00
James Almer
28eaf46da9
doc/APIchanges: fill missing versions and hashes
...
Signed-off-by: James Almer <jamrial@gmail.com>
2015-05-07 18:56:26 -03:00
James Almer
e0a403e1c2
vp9: add missing changelog and APIchanges entries for new VP9 profiles
...
Signed-off-by: James Almer <jamrial@gmail.com>
2015-05-07 18:35:12 -03:00
Tom Butterworth
288dc5b4a1
avcodec/s3tc: fix alpha decoding when dimensions are not a multiple of 4
...
Fix alpha position error for edge blocks of odd-dimensioned frames
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-07 23:10:56 +02:00
Michael Niedermayer
b1b0baa3d6
avcodec/g2meet: Check init_get_bits8() return value
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-07 22:50:39 +02:00
Michael Niedermayer
43e94d5af4
avcodec/g2meet: Use init_get_bits8()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-07 22:50:23 +02:00