Michael Niedermayer
15d4965239
avcodec/mjpegenc: dont store DQT for LJPEG
...
This may improve compatibility of lgpegs generated by libavcodec
also encoded ljpegs become slightly smaller
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-24 01:21:03 +02:00
Michael Niedermayer
fb45de779c
avformat/omadec: simplify checks in nprobe()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-24 00:29:02 +02:00
Lukasz Marek
23ad4d6f58
doc/outdevs: add sdl window_fullscreen option
...
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23 23:37:14 +02:00
Martin Storsjö
8812a8057f
h263dec: Remove a hack that can cause infinite loops
...
The actual usefulness of the hack is not known, and it does cause
infinite loops with some broken input files.
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-23 23:14:49 +03:00
Ronald S. Bultje
34b429d5ba
vp8: fix PPC assembly and bilinear C code to work if src_stride != dst_stride.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23 15:23:53 +02:00
Michael Niedermayer
3f3867ca27
Merge remote-tracking branch 'cigaes/master'
...
* cigaes/master:
lavfi/dualinput: reimplement on top of framesync.
lavfi: add an API to synchronize multiple video inputs.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23 15:04:09 +02:00
Michael Niedermayer
356031348c
avcodec/vc1dec: fix propagating error codes from various functions
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23 14:57:30 +02:00
Michael Niedermayer
a51f3b53fe
avcodec/vc1dec: Fix return code on malloc() failure from ff_vc1_decode_init_alloc_tables()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23 14:54:57 +02:00
Michael Niedermayer
552945efe6
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
movenchint: Clear size and len if the realloc failed
Conflicts:
libavformat/movenchint.c
See: 63621762ec
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23 14:52:20 +02:00
Michael Niedermayer
8c766228c1
Merge commit 'f2b00a5372bfa1d82a8ab99cb8eafac8a9473494'
...
* commit 'f2b00a5372bfa1d82a8ab99cb8eafac8a9473494':
movenc: Return a proper error code for invalid combinations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23 14:40:18 +02:00
Michael Niedermayer
50138a9235
Merge commit '23d6ba2c44540eb39c6880e4cbd527d297d264a9'
...
* commit '23d6ba2c44540eb39c6880e4cbd527d297d264a9':
vc1dec: Check the error handling flags on slice/field header decode errors
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23 14:34:36 +02:00
Michael Niedermayer
eeeb3c8fa3
Merge commit 'f7e616959aff8706edccdae763c24c897c449f6f'
...
* commit 'f7e616959aff8706edccdae763c24c897c449f6f':
electronicarts: Check packet sizes before reading
Conflicts:
libavformat/electronicarts.c
See: fb1ea777b3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23 14:27:09 +02:00
Michael Niedermayer
ef7e8efc6b
Merge commit 'ce67f442be0f6c4a8794272873852e256b5b8ee4'
...
* commit 'ce67f442be0f6c4a8794272873852e256b5b8ee4':
lavf: Avoid setting avg_frame_rate if delta_dts is negative
Conflicts:
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23 14:19:13 +02:00
Stefano Sabatini
7bac6e5cf8
ffprobe: fix uninitialized variable warning
...
Fix warning:
ffprobe.c:1684:21: warning: ‘start’ may be used uninitialized in this function [-Wmaybe-uninitialized] end = start + interval->end;
The warning is a false positive, since the variable is accessed only if
has_start is set, and in that case start has been already set.
2013-09-23 14:16:34 +02:00
Michael Niedermayer
c74fa39b93
Merge commit 'bb7bf175951475235ee7d0504198c4a30cf5d5dd'
...
* commit 'bb7bf175951475235ee7d0504198c4a30cf5d5dd':
vc1dec: Don't decode slices when the latest slice header failed to decode
Conflicts:
libavcodec/vc1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23 14:03:53 +02:00
Michael Niedermayer
79fbd7a5c1
Merge commit '5e25fdbfe01635cfc650ac4adc27d434b2df0d64'
...
* commit '5e25fdbfe01635cfc650ac4adc27d434b2df0d64':
vc1dec: Make sure last_picture is initialized in vc1_decode_skip_blocks
See: 09de0ffeab
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23 13:57:15 +02:00
Michael Niedermayer
8b85d9bfb6
Merge commit 'b772b0e28eba6abf76d86ee8c6e459a86642db5a'
...
* commit 'b772b0e28eba6abf76d86ee8c6e459a86642db5a':
vc1dec: Undo mpegvideo initialization if unable to allocate tables
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23 13:44:37 +02:00
Michael Niedermayer
eed40b2957
Merge commit 'ede508443e4bf57dc1e019fac81bf6244b88fbd3'
...
* commit 'ede508443e4bf57dc1e019fac81bf6244b88fbd3':
vc1dec: Fix leaks in ff_vc1_decode_init_alloc_tables on errors
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23 13:29:58 +02:00
Michael Niedermayer
621845fecc
Merge commit '91be1103fd1f79d381edf268c32f4166b6c3b6d8'
...
* commit '91be1103fd1f79d381edf268c32f4166b6c3b6d8':
wnv1: Make sure the input packet is large enough
Conflicts:
libavcodec/wnv1.c
See: f23a2418fb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23 13:20:42 +02:00
Michael Niedermayer
341dc59053
Merge commit 'f1eac2b8a0370b908cd691086d11f51342054730'
...
* commit 'f1eac2b8a0370b908cd691086d11f51342054730':
movenc: Use keyframes as default fragmentation point in ismv
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23 13:09:53 +02:00
Michael Niedermayer
d4574b7608
Merge commit 'a9553bbb336a7186c62b3b14a0499c1b6ba61ebd'
...
* commit 'a9553bbb336a7186c62b3b14a0499c1b6ba61ebd':
movenc: Set all implicit flags immediately in mov_write_header
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23 12:24:19 +02:00
Michael Niedermayer
b189c699b9
Merge commit '187023f6b2b43966acb2449a379b4ededdc4b22e'
...
* commit '187023f6b2b43966acb2449a379b4ededdc4b22e':
movenc: Set mov->mode earlier in mov_write_header
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23 12:17:10 +02:00
Michael Niedermayer
03e9506aae
Merge commit '5055035670bd1a1eaca64bd3bc71fb07de9df2c3'
...
* commit '5055035670bd1a1eaca64bd3bc71fb07de9df2c3':
tls: Do not abort on non-fatal TLS alerts with gnutls
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23 12:01:53 +02:00
Michael Niedermayer
09e06cd90f
Merge commit 'c951e4b442df9dde6051634a85359eb809bf2142'
...
* commit 'c951e4b442df9dde6051634a85359eb809bf2142':
flv: Make onTextData parsing robust
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23 11:56:29 +02:00
Michael Niedermayer
eaa20afa76
Merge commit 'ba77757a7efafe38924b6b423acfca8c1e1c62d6'
...
* commit 'ba77757a7efafe38924b6b423acfca8c1e1c62d6':
rtmp: Replace a magic number with a macro
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23 11:45:38 +02:00
Michael Niedermayer
c70e647a15
Merge commit '5840473890440dbe0bd2cce530ebb3d93e187ae6'
...
* commit '5840473890440dbe0bd2cce530ebb3d93e187ae6':
rtmp: Rewrite embedded flv handling
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23 11:40:15 +02:00
Michael Niedermayer
eee8cb42d0
Merge commit 'e40a0e822801d2485e4e555909d7a82713fa86a5'
...
* commit 'e40a0e822801d2485e4e555909d7a82713fa86a5':
rtmp: Refactor get_packet
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23 11:36:06 +02:00
Michael Niedermayer
f3a02f4bc1
Merge commit '32a414f316c7f0eea877370e3f9d9f25afbf5da2'
...
* commit '32a414f316c7f0eea877370e3f9d9f25afbf5da2':
rtmp: Support AMF_DATA_TYPE_MIXEDARRAY
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23 11:31:13 +02:00
Nicolas George
231e50157c
lavfi/dualinput: reimplement on top of framesync.
2013-09-23 09:50:09 +02:00
Nicolas George
53319d5c93
lavfi: add an API to synchronize multiple video inputs.
...
Compared to dualinput, this API can handle more than two
inputs and can generate frames synchronized to any or all
input streams.
2013-09-23 09:49:37 +02:00
Michael Bradshaw
3cfd4df8e7
libopenjpeg: init and close properly; don't config during encode
...
Signed-off-by: Michael Bradshaw <mjbshaw@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23 02:35:50 +02:00
Paul B Mahol
e494f44c05
avcodec/escape124: fix infinite loop
...
Remove can_safely_read() as its not really needed with
checked bitstream reader.
Fixes #2984 .
Reported-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-23 00:19:05 +00:00
Timothy Gu
ca10d66719
doc/filters: add [] labels for the graph of the opening paragraph example
...
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2013-09-23 00:11:56 +02:00
Stefano Sabatini
21f6ff3801
doc/filters: use between() function in select examples
...
Simplify.
2013-09-22 23:54:39 +02:00
Stefano Sabatini
57618d80af
doc/fftools: rework some paragraph in the AVOptions chapter
...
Fix typos, and clarify note about codec AVOptions.
2013-09-22 23:54:39 +02:00
Paul B Mahol
0de4efb8d7
doc/filters: put ladspa configure option into @code{}
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-22 20:41:01 +00:00
Michael Niedermayer
fbf861cb84
tests/fate/prores: fix skip alpha tests on big endian
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-22 20:57:34 +02:00
Michael Niedermayer
b5b762b714
avcodec/avcodec.h: skip_alpha should not be accessed directly (would cause ABI issues)
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-22 20:57:34 +02:00
Paul B Mahol
f8e8932e92
doc/filters: mention configure option for ladspa
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-22 18:45:50 +00:00
Martin Storsjö
b6c7bd53f4
movenchint: Clear size and len if the realloc failed
...
Previously these were left in an inconsistent state.
Pointed out by Michael Niedermayer.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-22 21:02:52 +03:00
Martin Storsjö
f2b00a5372
movenc: Return a proper error code for invalid combinations
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-22 21:02:52 +03:00
Martin Storsjö
23d6ba2c44
vc1dec: Check the error handling flags on slice/field header decode errors
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-22 21:02:52 +03:00
Martin Storsjö
f7e616959a
electronicarts: Check packet sizes before reading
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-22 21:02:52 +03:00
Martin Storsjö
ce67f442be
lavf: Avoid setting avg_frame_rate if delta_dts is negative
...
This avoids setting avg_frame_rate to invalid (negative)
values.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-22 21:02:52 +03:00
Michael Niedermayer
bb7bf17595
vc1dec: Don't decode slices when the latest slice header failed to decode
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-22 21:02:52 +03:00
Martin Storsjö
5e25fdbfe0
vc1dec: Make sure last_picture is initialized in vc1_decode_skip_blocks
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-22 21:02:52 +03:00
Martin Storsjö
b772b0e28e
vc1dec: Undo mpegvideo initialization if unable to allocate tables
...
Previously, s->context_initialized was left set to 1
if ff_vc1_decode_init_alloc_tables failed, skipping the
initialization completely on the next decode call.
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-22 21:02:47 +03:00
Kieran Kunhya
283fb76d3d
lavc: Add support for interleaved chroma formats to libx264. Interleaved chroma is x264's native format
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-22 19:55:57 +02:00
Paul B Mahol
b00fb157ba
avcodec/sgirledec: fix infinite loop in decode_sgirle8()
...
Fixes #2985 .
Reported-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-22 17:30:51 +00:00
Paul B Mahol
601eab2bbf
avfilter: add ladspa wrapper filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-22 16:36:10 +00:00