Michael Niedermayer
049161fb7c
Merge commit '529c05698e88b057f0bea61e0d85f2b42925b5ea'
...
* commit '529c05698e88b057f0bea61e0d85f2b42925b5ea':
movenc: fixes a questionable valgrind uninitialized value warning
See: 3c5c6870a7
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-10 20:19:19 +02:00
Stephan Holljes
de3a7ef204
lavf/http: Correctly terminate session with HTTP POST client.
...
Send a footer to correctly close client sockets.
This fixes network errors in client applications.
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com >
Reviewed-by: Nicolas George <george@nsup.org >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-10 18:17:28 +02:00
Michael Niedermayer
63276fa9c1
avcodec/mips: remove ;;
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-10 16:23:22 +02:00
Igor Derzhavin
203f9c8ff0
libavformat/flvdec.c: don't build index_entries for input stream if AVIOContext is not seekable
...
Signed-off-by: Igor Derzhavin <igor.derzhavin@gmail.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-10 16:22:11 +02:00
Vittorio Giovara
c0e6b8cab8
mpegvideo: Mark one function as static
2015-06-10 14:06:44 +01:00
Vittorio Giovara
d1dd0d404c
mpegvideo: Move block permutation function where is used
...
Mark it as static.
2015-06-10 14:06:23 +01:00
Vittorio Giovara
c6aa0554b0
mpegvideo: Drop release_unused_pictures() function
...
It is only used in one place, and it is small enough that it might be
called directly.
2015-06-10 14:05:53 +01:00
Vittorio Giovara
7061bf0925
mpegvideo: Move Picture-related functions to a separate file
2015-06-10 14:05:32 +01:00
Janne Grunau
529c05698e
movenc: fixes a questionable valgrind uninitialized value warning
...
display_matrix_size is only initialized when av_stream_get_side_data()
returns a side data pointer. The code is safe since the only effect this
has is setting the display_matrix pointer to NULL which it was already
anyway.
2015-06-10 14:32:11 +02:00
Shivraj Patil
d6d98237ed
avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for HEVC intra prediction functions
...
This patch adds MSA (MIPS-SIMD-Arch) optimizations for HEVC intra predition functions in new file hevcpred_msa.c
Adds new generic macros (needed for this patch) in libavutil/mips/generic_macros_msa.h
Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-10 13:53:03 +02:00
Shivraj Patil
271195f85b
avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for HEVC loop filter and sao functions
...
This patch adds MSA (MIPS-SIMD-Arch) optimizations for HEVC loop filter and sao functions in new file hevc_lpf_sao_msa.c
Adds new generic macros (needed for this patch) in libavutil/mips/generic_macros_msa.h
In this patch, in comparision with previous patch, duplicated c functions are removed.
Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-10 13:14:50 +02:00
Andreas Cadhalpun
05c57ba2f4
takdec: ensure chan2 is a valid channel index
...
If chan2 is not smaller than the number of channels, it can cause
segmentation faults due to dereferencing a NULL pointer.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-10 12:21:04 +02:00
Michael Niedermayer
aef0e0f009
avcodec/h264_slice: Use AVFrame diemensions for grayscale handling
...
The AVFrame values are closer to the AVFrame bitmap changed instead of
the AVCodecContext values, so this should be more robust
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-10 11:37:48 +02:00
Michael Niedermayer
b58a3c8975
avcodec/jpeg2000dec: Print the correct variable in the component error message
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-10 04:50:40 +02:00
Michael Niedermayer
81471d8246
avcodec/jpeg2000dec: increase tile_parts to 6
...
Fixes Ticket4602
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-10 04:50:14 +02:00
Michael Niedermayer
213f2da46a
avcodec/jpeg2000dec: Fix shift for RGB(A)48/64
...
Found-by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-10 04:19:38 +02:00
Michael Niedermayer
913685f552
avdevice/lavfi: do not rescale AV_NOPTS_VALUE in lavfi_read_packet()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-10 00:56:02 +02:00
Michael Niedermayer
58142a27ea
MAINTAINERS: add 2.7
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
n2.8-dev
2015-06-09 23:55:19 +02:00
Andreas Cadhalpun
58995f647b
sonic: set avctx->channels in sonic_decode_init
...
Otherwise it can be 0 in sonic_decode_frame, causing SIGFPE crashes.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2015-06-09 23:21:51 +02:00
Michael Niedermayer
3a99f6e79f
Changelog: Add 2.7 entry
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-09 23:14:57 +02:00
Michael Niedermayer
a5f44bc446
doc/APIchanges: fill in missing stuff
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-09 23:08:53 +02:00
Michael Niedermayer
6ddb109b90
doc/APIchanges: Add 2.7 separator
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-09 23:05:07 +02:00
Simon Thelen
83307a32eb
libavutil/channel_layout: Correctly return layout when channel specification ends with a trailing 'c'.
...
Return layout when FF_API_GET_CHANNEL_LAYOUT_COMPAT is set even if the
layout itself is not in the deprecated style.
Signed-off-by: Simon Thelen <ffmpeg-dev@c-14.de >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-09 22:44:34 +02:00
Vignesh Venkatasubramanian
34ae98a771
lavf/webm_chunk: Remove AVFMT_ALLOW_FLUSH
...
The flag was set unintentionally and the code will break if a NULL
packet is passed in.
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-09 21:19:57 +02:00
Michael Niedermayer
0916938a8d
avcodec/jpeg2000dec: Fix gain regression with gray16
...
Found-by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-09 20:26:38 +02:00
Michael Niedermayer
6bf8d9e164
fate: Force jpeg2000 decoder for dcinema
...
so that no external decoder is used which would break the test
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-09 20:09:12 +02:00
Michael Niedermayer
adbe1d7de4
avcodec/libopenjpegdec: Mark as experimental if <= 1.3
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-09 18:59:30 +02:00
Michael Niedermayer
dbbb31e5bb
avcodec/jpeg2000: remove unused variable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-09 18:48:39 +02:00
Michael Niedermayer
32b1131fc1
avformat/oggenc: Fix return code in case of flushing
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-09 18:42:55 +02:00
Michael Niedermayer
dac7b27802
Merge commit 'b14086ca38efa1a86cb0f0c6aa147b05f698877b'
...
* commit 'b14086ca38efa1a86cb0f0c6aa147b05f698877b':
mkv: Correctly report the latest packet had been flushed
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-09 18:30:24 +02:00
Michael Niedermayer
962654f251
Merge commit 'b380337020e271c5431aa8ef8f8e9dfda5e919b2'
...
* commit 'b380337020e271c5431aa8ef8f8e9dfda5e919b2':
mpjpegdec: don't try to alloc an AVIOContext when probe is guaranteed to fail
See: 1382add59d
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-09 18:09:26 +02:00
Michael Niedermayer
551813a963
Merge commit '210921722bf828b3b895ebcbc34374e6c4452c6f'
...
* commit '210921722bf828b3b895ebcbc34374e6c4452c6f':
imc: add required padding for GetBitContext buffer
Conflicts:
libavcodec/imc.c
See: 7444cf9a9c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-09 17:44:13 +02:00
Michael Niedermayer
840465ebf9
Merge commit '09447f2b0fafac6d9565aab82a4c5f16fc99ee5e'
...
* commit '09447f2b0fafac6d9565aab82a4c5f16fc99ee5e':
ac3_parser: add required padding for GetBitContext buffer
See: fccd85b9f3
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-09 17:35:14 +02:00
Michael Niedermayer
5f48a73bb0
Merge commit 'fb1473080223a634b8ac2cca48a632d037a0a69d'
...
* commit 'fb1473080223a634b8ac2cca48a632d037a0a69d':
aac_parser: add required padding for GetBitContext buffer
See: fccd85b9f3
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-09 17:22:35 +02:00
Rodger Combs
4b082bc241
doc/muxers: document new break_non_keyframes option
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-09 17:08:35 +02:00
Michael Niedermayer
44327cbc9a
avcodec/jpeg2000: Disable special case for JPEG2000_QSTY_SI
...
The code gave apparently completely wrong values
Fixes Ticket2872
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-09 16:44:32 +02:00
Michael Niedermayer
45db921806
avcodec/jpeg2000dec: Add placeholder for PLT parsing
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-09 15:16:46 +02:00
Michael Niedermayer
b6ee1912f9
avcodec/jpeg2000dec: Handle Psot = 0
...
Fixes Ticket2869
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-09 14:43:03 +02:00
Luca Barbato
b14086ca38
mkv: Correctly report the latest packet had been flushed
...
Bug-Id: 865
CC: libav-stable@libav.org
2015-06-09 14:27:54 +02:00
Rodger Combs
e60b018c74
lavf/segment: add an option to allow breaking on non-keyframes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-09 13:26:00 +02:00
James Almer
b380337020
mpjpegdec: don't try to alloc an AVIOContext when probe is guaranteed to fail
...
The first check is done without the AVIOContext, so alloc it only if said check succeeds
Signed-off-by: James Almer <jamrial@gmail.com >
Signed-off-by: Janne Grunau <janne-libav@jannau.net >
2015-06-09 10:07:11 +02:00
Janne Grunau
210921722b
imc: add required padding for GetBitContext buffer
...
Fixes stack buffer overflow errors detected by address sanitizer in
fate-imc.
CC: libav-stable@libav.org
2015-06-09 10:07:04 +02:00
Janne Grunau
09447f2b0f
ac3_parser: add required padding for GetBitContext buffer
...
Fixes stack buffer overflow errors detected by address sanitizer in
various fate tests.
CC: libav-stable@libav.org
2015-06-09 10:06:59 +02:00
Janne Grunau
fb14730802
aac_parser: add required padding for GetBitContext buffer
...
Fixes stack buffer overflow errors detected by address sanitizer in
various fate tests.
CC: libav-stable@libav.org
2015-06-09 10:05:54 +02:00
Michael Niedermayer
e100966575
avcodec/x86/h264_weight: handle weight1=128
...
Fix ticket4596
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-09 05:11:09 +02:00
Michael Niedermayer
7c9fcdfabd
avcodec/jpeg2000dec: Fix some 5/3 bitexactness issues
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-09 02:17:53 +02:00
Rodger Combs
ecefce41d9
lavf/tls_securetransport: fix SNI support when not verifying
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-09 01:06:32 +02:00
Michael Niedermayer
074159ed70
avcodec/jpeg2000dec: Fix subsampled decoding
...
Fixes part of Ticket3619
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-09 01:02:05 +02:00
Michael Niedermayer
12ba1b2b4d
avcodec/jpeg2000dec: Check that coords match before applying ICT
...
This avoid potential out of array accesses
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-09 01:02:05 +02:00
Michael Niedermayer
028c59c17b
avcodec/jpeg2000dec: Fix high bit depth branch sample shift
...
Fix part of Ticket3619
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2015-06-09 01:01:01 +02:00