OSDN Git Service
Carl Eugen Hoyos [Wed, 12 Nov 2014 08:55:11 +0000 (09:55 +0100)]
lavd/avfoundation: Remove unused -frame_rate option.
Reimar Döffinger [Wed, 12 Nov 2014 08:53:01 +0000 (09:53 +0100)]
configure: Hack to treat x32 as x86_64.
Allows shared compilation on x32 with --disable-asm.
Michael Niedermayer [Wed, 12 Nov 2014 02:27:26 +0000 (03:27 +0100)]
avcodec/h264_parser: Avoid adding SEI to the global header
Only consider SEI when no PPS has been found yet
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 12 Nov 2014 00:04:46 +0000 (01:04 +0100)]
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: signal the frame queue before closing audio
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Vignesh Venkatasubramanian [Tue, 11 Nov 2014 18:02:05 +0000 (10:02 -0800)]
lavf/webmdashenc: Representation IDs should be unique.
According to the DASH spec, Representation IDs should be unique
across all adaptation sets. Fixing that and updating the fate
reference file to reflect this change.
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 11 Nov 2014 23:08:06 +0000 (00:08 +0100)]
Merge commit '
c9c7d59b7d26f0328d612995dd9256337ae1cbfb'
* commit '
c9c7d59b7d26f0328d612995dd9256337ae1cbfb':
tiff: Use av_mallocz_array
Conflicts:
libavcodec/tiffenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 11 Nov 2014 22:54:37 +0000 (23:54 +0100)]
Merge commit '
c6074a30ba3b5fb4319ee6ee599656d58548cdc8'
* commit '
c6074a30ba3b5fb4319ee6ee599656d58548cdc8':
opt: Fix the documentation mentioning av_set_string3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 11 Nov 2014 22:19:27 +0000 (23:19 +0100)]
Merge commit '
1b667269062eb6aec0b8726393ea91b7f7f57fde'
* commit '
1b667269062eb6aec0b8726393ea91b7f7f57fde':
h264_parser: don't stop on SPS_EXT in split
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 11 Nov 2014 22:18:03 +0000 (23:18 +0100)]
Merge commit '
4cb9f1a77432de6f368df69bebbc082368a88c86'
* commit '
4cb9f1a77432de6f368df69bebbc082368a88c86':
h264_cabac: fix one fill_rectangle() indentation level
See:
4260ed462b4ca92e90fb13006b7b5db8010a32d0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 11 Nov 2014 22:16:15 +0000 (23:16 +0100)]
Merge commit '
60b055133485891405722bc9722e2c74fc9764b8'
* commit '
60b055133485891405722bc9722e2c74fc9764b8':
png_parser: fix size of chunk_lenght
Conflicts:
libavcodec/png_parser.c
See:
2ee6dca3b8f40132be5c8b77e3700a9e3f26c382
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 11 Nov 2014 22:06:44 +0000 (23:06 +0100)]
Merge commit '
443502aed8b814d883825e52e91e4f018955aa66'
* commit '
443502aed8b814d883825e52e91e4f018955aa66':
dvbsubdec: move shared codepath
Conflicts:
libavcodec/dvbsubdec.c
The merged code is ignored and the factorization redone with
the code that is in FFmpeg.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Marton Balint [Mon, 10 Nov 2014 22:23:47 +0000 (23:23 +0100)]
ffplay: signal the frame queue before closing audio
Fixed regression caused by
631ac655c00e978e19d05dab572bc1ffd6078c63 when ffplay
does not quit if the audio thread is blocked.
Signed-off-by: Marton Balint <cus@passwd.hu>
Michael Niedermayer [Thu, 31 Jul 2014 11:25:43 +0000 (13:25 +0200)]
avcodec/dvbsubdec: Fix 8bit non_mod case
Untested, i failed to find a sample which triggers this case
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 11 Nov 2014 21:20:20 +0000 (22:20 +0100)]
avcodec/dvbsubdec: use av_freep() for saftey
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 11 Nov 2014 21:19:54 +0000 (22:19 +0100)]
Merge commit '
2383323661f3b8342b2c4d356fcfe8c5d1b045f8'
* commit '
2383323661f3b8342b2c4d356fcfe8c5d1b045f8':
dvbsubdec: improve error checking
Conflicts:
libavcodec/dvbsubdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 11 Nov 2014 21:15:14 +0000 (22:15 +0100)]
avcodec/dvbsubdec: Add return code to save_subtitle_set()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 11 Nov 2014 21:04:34 +0000 (22:04 +0100)]
Michael Niedermayer [Tue, 11 Nov 2014 21:03:27 +0000 (22:03 +0100)]
Michael Niedermayer [Tue, 11 Nov 2014 20:46:56 +0000 (21:46 +0100)]
Merge commit '
9e9be5a20c0b36dce1cae11f5f5957886231a764'
* commit '
9e9be5a20c0b36dce1cae11f5f5957886231a764':
hevc_mvs: prevent unitialized use
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Lukasz Marek [Sun, 9 Nov 2014 22:10:34 +0000 (23:10 +0100)]
fate: add opt-test
Lukasz Marek [Sun, 9 Nov 2014 22:09:44 +0000 (23:09 +0100)]
lavu/opt: update tests
In general this commit prepares opt tests to be added to fate.
The commit set some non-zero defaults for test options.
It allows to check if defaults are really set.
Added printing of default values.
Added more cases for testing av_set_options_string
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Lukasz Marek [Sun, 9 Nov 2014 22:09:07 +0000 (23:09 +0100)]
lavu/opt: add support for binary defaults
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Lukasz Marek [Sun, 9 Nov 2014 22:15:58 +0000 (23:15 +0100)]
lavu/opt: check for NULL before parsing
set_string_binary crashes when called with val==NULL
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Michael Niedermayer [Tue, 11 Nov 2014 20:38:55 +0000 (21:38 +0100)]
Merge commit '
0e1ebfebc8326069732795698a82f3fea0742a54'
* commit '
0e1ebfebc8326069732795698a82f3fea0742a54':
4xm: drop unnecessary check
Conflicts:
libavcodec/4xm.c
The check is currently redundant, it is for saftey left in place though
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 11 Nov 2014 20:35:53 +0000 (21:35 +0100)]
Merge commit '
7c61e4b1a0f9e9f5b7bc08879e9e101eb90b19ea'
* commit '
7c61e4b1a0f9e9f5b7bc08879e9e101eb90b19ea':
hpeldsp: Increase put_no_rnd_pixels_tab[][] size
See:
1e41b8cd072e4f738d9ef75b1ac310a9c8fbcc19
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 11 Nov 2014 20:33:27 +0000 (21:33 +0100)]
Merge commit '
db71c4926d948717ce3b74253eb385dc43dcb14d'
* commit '
db71c4926d948717ce3b74253eb385dc43dcb14d':
mjpegenc: fix argument size in encode_mb
Conflicts:
libavcodec/mjpegenc.c
libavcodec/mjpegenc.h
See:
256f530603ef3838a712a4fcd737b46b7bce455e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 11 Nov 2014 20:24:15 +0000 (21:24 +0100)]
Michael Niedermayer [Tue, 11 Nov 2014 20:20:50 +0000 (21:20 +0100)]
Merge commit '
898e9a24ef13d8c56b4abf4ee0af09cdb0343e2d'
* commit '
898e9a24ef13d8c56b4abf4ee0af09cdb0343e2d':
mpegvideo: check mpv return value
Conflicts:
libavcodec/mpegvideo.c
See:
f4d73f0fb55e0b5931c859ddb4d2d1617b60d560
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 11 Nov 2014 20:04:45 +0000 (21:04 +0100)]
Merge commit '
fe27aeaeab07142b1acd2690c64ee6973bdd7eba'
* commit '
fe27aeaeab07142b1acd2690c64ee6973bdd7eba':
mpeg12enc: increase declared size of block function argument
See:
2cf514354bbeebb2334d00ab54c3fcb8ae2ee678
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 11 Nov 2014 19:58:33 +0000 (20:58 +0100)]
Merge commit '
52f954da7594c31ad94c9bcb54290145b59b27f5'
* commit '
52f954da7594c31ad94c9bcb54290145b59b27f5':
libavcodec: Unconditionally build xiph.o
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Marvin Scholz [Tue, 11 Nov 2014 17:24:20 +0000 (18:24 +0100)]
MAINTAINERS: Add myself as maintainer for Icecast protocol
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Marvin Scholz [Tue, 11 Nov 2014 01:10:22 +0000 (02:10 +0100)]
Icecast: Use 100-continue if possible for proper error handling
Using 100-continue ffmpeg will only send data if the server confirms it,
so if there is an error with auth or mounpoint, this allows that it is
properly reported to the user. Else ffmpeg sends data and just quits at
some point without an error message.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Marvin Scholz [Tue, 11 Nov 2014 00:51:23 +0000 (01:51 +0100)]
Icecast: always send a content-type
use a default (audio/mpeg for historical reason) if none. Required since Icecast 2.4.1
Not using AVOption default because this breaks content-type warnings (needs to
detect if no type was set by the user)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Sun, 9 Nov 2014 14:11:26 +0000 (15:11 +0100)]
tiff: Use av_mallocz_array
CC: libav-stable@libav.org
Luca Barbato [Tue, 11 Nov 2014 01:39:27 +0000 (02:39 +0100)]
opt: Fix the documentation mentioning av_set_string3
It is av_opt_set now.
John Stebbins [Fri, 31 Oct 2014 15:24:38 +0000 (08:24 -0700)]
h264_parser: don't stop on SPS_EXT in split
Add SPS_EXT, SEI, and subset SPS to codes that are skipped during split.
These codes can come before the PPS and results in incomplete extradata.
Michael Niedermayer [Mon, 10 Nov 2014 07:43:08 +0000 (08:43 +0100)]
h264_cabac: fix one fill_rectangle() indentation level
Bug-Id: CID
1087088
Vittorio Giovara [Sun, 9 Nov 2014 07:48:35 +0000 (08:48 +0100)]
png_parser: fix size of chunk_lenght
Fixes the comparison against constant value 0x7fffffff.
CC: libav-stable@libav.org
Bug-Id: CID
1198260
Vittorio Giovara [Sun, 9 Nov 2014 07:48:45 +0000 (08:48 +0100)]
dvbsubdec: move shared codepath
CC: libav-stable@libav.org
Bug-Id: CID
1238839
Vittorio Giovara [Sun, 9 Nov 2014 07:48:44 +0000 (08:48 +0100)]
dvbsubdec: improve error checking
Use av_mallocz_array instead of iterating and check the returned memory.
Check returned memory and cleanly exit in case of error during the loop.
Avoid a null pointer dereference for invalid data.
CC: libav-stable@libav.org
Bug-Id: CID 29575
Jernej Fijačko [Sun, 9 Nov 2014 07:48:46 +0000 (08:48 +0100)]
dvbsubdec: add missing break
Fix a memory leak too.
CC: libav-stable@libav.org
Bug-Id: CID 732230
Michael Niedermayer [Sun, 9 Nov 2014 07:48:38 +0000 (08:48 +0100)]
hevc_cabac: decrease CABAC_MAX_BIN
Prevents shifts with undefined behavior, as no syntax element has a valid
value greater than 1 << 31.
Bug-Id: CID
1206635
Vittorio Giovara [Sun, 9 Nov 2014 07:48:39 +0000 (08:48 +0100)]
hevc_mvs: prevent unitialized use
CC: libav-stable@libav.org
Bug-Id: CID
1244202
Changjiang Wei [Tue, 11 Nov 2014 02:39:39 +0000 (10:39 +0800)]
avcodec/hevc.c: for big negative mvy value, should wait line 0 of ref frame due to edge extending
Reviewed-by: Mickaël Raulet <mraulet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Vittorio Giovara [Sun, 9 Nov 2014 07:48:40 +0000 (08:48 +0100)]
4xm: drop unnecessary check
data_size is always >= 0 in this case.
CC: libav-stable@libav.org
Bug-Id: CID
1238788
Michael Niedermayer [Tue, 4 Nov 2014 14:36:53 +0000 (09:36 -0500)]
hpeldsp: Increase put_no_rnd_pixels_tab[][] size
CC: libav-stable@libav.org
Bug-Id: CID 991852
Vittorio Giovara [Wed, 5 Nov 2014 14:40:30 +0000 (09:40 -0500)]
mjpegenc: fix argument size in encode_mb
CC: libav-stable@libav.org
Bug-Id: CID
1047235
Rong Yan [Tue, 11 Nov 2014 06:03:01 +0000 (06:03 +0000)]
libavcodec/ppc/me_cmp.c : support little endian in sse8_altivec(), hadamard8_diff8x8_altivec() and hadamard8_diff16x8_altivec()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Rong Yan [Tue, 11 Nov 2014 06:03:01 +0000 (06:03 +0000)]
libavcodec/ppc/me_cmp.c : factorize little and big endian code
add marcos GET_PERM() LOAD_PIX() for POWER LE
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Vittorio Giovara [Tue, 4 Nov 2014 14:37:01 +0000 (09:37 -0500)]
mpegvideo: fix size of array
CC: libav-stable@libav.org
Bug-Id: CID
1238789
Vittorio Giovara [Tue, 4 Nov 2014 14:37:00 +0000 (09:37 -0500)]
mpegvideo: check mpv return value
CC: libav-stable@libav.org
Bug-Id: CID
1238786
Michael Niedermayer [Tue, 4 Nov 2014 14:36:58 +0000 (09:36 -0500)]
mpeg12enc: increase declared size of block function argument
CC: libav-stable@libav.org
Bug-Id: CID
1047236
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Martin Storsjö [Mon, 10 Nov 2014 08:14:45 +0000 (10:14 +0200)]
libavcodec: Unconditionally build xiph.o
vorbis_parser.o is built unconditionally since
5e80fb7ff, and the
unconditionally built parts of it depend on xiph.o.
This fixes builds with --disable-everything.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Tue, 11 Nov 2014 09:26:28 +0000 (10:26 +0100)]
Merge commit '
b776113e5d4a56759615196de98efe802e95a6b6'
* commit '
b776113e5d4a56759615196de98efe802e95a6b6':
v4l2: Unify one instance of reading/storing errno
Conflicts:
libavdevice/v4l2.c
See:
60950adc18fe145a235211e75da68ab07123fcaa
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Mon, 10 Nov 2014 07:49:01 +0000 (09:49 +0200)]
v4l2: Unify one instance of reading/storing errno
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Tue, 11 Nov 2014 02:34:58 +0000 (03:34 +0100)]
avcodec/utvideodec: Fix undefined behavior in shift
Fixes: asan_heap-oob_2573085_3783_utvideo_rgba_median.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 11 Nov 2014 02:19:11 +0000 (03:19 +0100)]
avcodec/lagarith: fix integer overflow
Fixes: asan_heap-oob_1bf48fa_2513_lag-yuy2.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Tue, 11 Nov 2014 00:09:31 +0000 (01:09 +0100)]
tests/Makefile: New try to fix fate-ffprobe with --target-path.
Lukasz Marek [Sat, 1 Nov 2014 02:00:52 +0000 (03:00 +0100)]
ffserver_config: drop requirement video size being multiple of 16
Such strong requirement constraint doesn't allow to use 360p.
Changed to warning when video size is not being multiple of 2.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Michael Niedermayer [Mon, 10 Nov 2014 22:07:50 +0000 (23:07 +0100)]
avcodec/wmaprodec: Fix integer overflow in sfb_offsets initialization
Fixes out of array read
Fixes: asan_heap-oob_2aec5b0_1828_classical_22_16_2_16000_v3c_0_exclusive_0_29.wma
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Jon Morley [Mon, 10 Nov 2014 18:43:42 +0000 (10:43 -0800)]
options_table.h: min value for colorspace is 0 (AVCOL_SPC_RGB)
The min value for colorspace should be zero and not one since the first
valid index into the frame colorspace array is AVCOL_SPC_RGB which is 0.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Thilo Borgmann [Mon, 10 Nov 2014 19:31:14 +0000 (20:31 +0100)]
lavd/avfoundation: Use internal av_strtok instead of std lib strtok
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 10 Nov 2014 18:44:20 +0000 (19:44 +0100)]
avcodec/utvideodec: fix assumtation that slice_height >= 1
Fixes out of array read
Fixes: asan_heap-oob_2573085_3783_utvideo_rgba_median.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 10 Nov 2014 16:30:44 +0000 (17:30 +0100)]
avcodec/lagarith: fix chroma plane width & height
Fixes out of array read
Fixes: asan_heap-oob_1bf48fa_2513_lag-yuy2.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Mon, 10 Nov 2014 10:54:59 +0000 (11:54 +0100)]
lavfi/xbr: apply misc cosmetical fixes
Michael Niedermayer [Mon, 10 Nov 2014 10:38:30 +0000 (11:38 +0100)]
Merge commit '
28396d17ff1c1493b78d6eece484ffc27ed86d0d'
* commit '
28396d17ff1c1493b78d6eece484ffc27ed86d0d':
libfdk-aacdec: Support building with the latest version of fdk-aac
See:
b44a242c3dfa1225ca4e75135ed5fbe7f0e3c378
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 10 Nov 2014 10:25:08 +0000 (11:25 +0100)]
Merge remote-tracking branch 'github/master'
* github/master:
tests: Fix test name for pixfmts tests
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Tue, 4 Nov 2014 08:22:05 +0000 (10:22 +0200)]
libfdk-aacdec: Support building with the latest version of fdk-aac
The latest fdk-aac code drop (from android 5.0) changed the channel
layout enums (changing the value of existing enum constants), and
renamed the option for downmixing.
The failsafe comparison between ctype and FF_ARRAY_ELEMS(channel_counts)
can trigger warnings (-Wtautological-constant-out-of-range-compare)
when building with the old FDK AAC releases, where it can't be
out of range with the enum values used there.
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Timothy Gu [Mon, 10 Nov 2014 05:37:18 +0000 (21:37 -0800)]
tests: Fix test name for pixfmts tests
Clément Bœsch [Mon, 10 Nov 2014 05:36:28 +0000 (06:36 +0100)]
doc/filters: explicit and complete xBR documentation
Clément Bœsch [Mon, 10 Nov 2014 05:34:11 +0000 (06:34 +0100)]
avfilter/xbr: drop yet another x2 reference
Clément Bœsch [Mon, 10 Nov 2014 05:32:27 +0000 (06:32 +0100)]
avfilter/xbr: fix filter description field
Clément Bœsch [Mon, 10 Nov 2014 05:28:44 +0000 (06:28 +0100)]
avfilter/xbr: fix TODO entry
Clément Bœsch [Mon, 10 Nov 2014 05:26:45 +0000 (06:26 +0100)]
avfilter/xbr: consistent use of @see
Clément Bœsch [Mon, 10 Nov 2014 05:24:54 +0000 (06:24 +0100)]
Changelog: explicit that xBR scaler is implemented as a filter
Michael Niedermayer [Mon, 10 Nov 2014 02:44:23 +0000 (03:44 +0100)]
avfilter/vf_xbr: Uppercase first letter of context type for consistency
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Arwa Arif [Thu, 30 Oct 2014 16:36:20 +0000 (22:06 +0530)]
lavfi: add xbr filter xBR
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 10 Nov 2014 01:54:24 +0000 (02:54 +0100)]
avcodec/utils: Fix warning: comparison between enum foo and enum bar [-Wenum-compare]
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 10 Nov 2014 01:53:21 +0000 (02:53 +0100)]
avcodec/utils: make sidedata remapping table static const
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Sat, 8 Nov 2014 20:39:44 +0000 (22:39 +0200)]
libfdk-aacdec: Support building with the latest version of fdk-aac
The latest fdk-aac code drop (from android 5.0) changed the channel
layout enums (changing the value of existing enum constants), and
renamed the option for downmixing.
The failsafe comparison between ctype and FF_ARRAY_ELEMS(channel_counts)
can trigger warnings (-Wtautological-constant-out-of-range-compare)
when building with the old FDK AAC releases, where it can't be
out of range with the enum values used there.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 10 Nov 2014 00:36:39 +0000 (01:36 +0100)]
Merge commit '
09f25533a564eab743f258d168697a11122914c4'
* commit '
09f25533a564eab743f258d168697a11122914c4':
v4l2: Preserve errno values
Conflicts:
libavdevice/v4l2.c
See:
60950adc18fe145a235211e75da68ab07123fcaa
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 10 Nov 2014 00:17:38 +0000 (01:17 +0100)]
Merge commit '
a1a259881fa7b23e2ffc0c2a43d4923fe42d0478'
* commit '
a1a259881fa7b23e2ffc0c2a43d4923fe42d0478':
v4l2: Use av_strerror
Conflicts:
libavdevice/v4l2.c
See:
60950adc18fe145a235211e75da68ab07123fcaa
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 9 Nov 2014 23:57:41 +0000 (00:57 +0100)]
Merge commit '
e3e317e0c015b164b6c2eb8913e393216d78de23'
* commit '
e3e317e0c015b164b6c2eb8913e393216d78de23':
lavc: Compact the side-data passthrough
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Kieran Kunhya [Sun, 9 Nov 2014 19:39:35 +0000 (20:39 +0100)]
swscale: fix yuv2yuvX_8 assembly on x86
use_mmx_vfilter check/fix by commiter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Sun, 9 Nov 2014 17:28:29 +0000 (18:28 +0100)]
Set -scan_all_pmts 1 in ffmpeg, ffplay and ffprobe if not set by user.
Fixes ticket #3762.
Lukasz Marek [Sat, 8 Nov 2014 17:12:56 +0000 (18:12 +0100)]
lavu/opt: copy dict in av_opt_copy
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Lukasz Marek [Sat, 8 Nov 2014 16:12:29 +0000 (17:12 +0100)]
lavu/opt: document av_opt_copy function
Lukasz Marek [Sat, 8 Nov 2014 16:01:40 +0000 (17:01 +0100)]
lavc/options: fix shallow copy context
avcodec_copy_context leaves shallow copy of string/binary/dict options.
Double free/accessing freed memory may occur.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Marton Balint [Sun, 9 Nov 2014 13:19:36 +0000 (14:19 +0100)]
avfilter/avf_showwaves: fix off by one error in loop condition
It caused segfaults.
Signed-off-by: Marton Balint <cus@passwd.hu>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Marton Balint [Mon, 13 Oct 2014 23:15:30 +0000 (01:15 +0200)]
ffplay: only output null packet once on EOF
The generic decoder properly flushes the codecs with one null packet as well.
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Fri, 24 Oct 2014 13:16:41 +0000 (15:16 +0200)]
ffplay: fix indentation after last commit
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sat, 19 Oct 2013 12:34:28 +0000 (14:34 +0200)]
ffplay: implement separete audio decoder thread
Signed-off-by: Marton Balint <cus@passwd.hu>
Luca Barbato [Thu, 6 Nov 2014 08:58:03 +0000 (09:58 +0100)]
v4l2: Preserve errno values
av_log usually resets it.
Michael Niedermayer [Sun, 9 Nov 2014 11:36:23 +0000 (12:36 +0100)]
avformat/librtmp: fix swfurl
Found-by: JULIAN GARDNER <joolzg@btinternet.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Tristan Matthews [Wed, 5 Nov 2014 20:09:40 +0000 (15:09 -0500)]
v4l2: Use av_strerror
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Luca Barbato [Tue, 4 Nov 2014 20:11:47 +0000 (21:11 +0100)]
lavc: Compact the side-data passthrough
Michael Niedermayer [Sun, 9 Nov 2014 03:25:12 +0000 (04:25 +0100)]
avcodec/aacdec: Skip processing channel elements which have not been present
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 8 Nov 2014 22:32:39 +0000 (23:32 +0100)]
avcodec/aacenc: check input for NaN
Fixes Ticket3762
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 8 Nov 2014 20:25:52 +0000 (21:25 +0100)]
avformat/mpegts: improve first valid PMT heuristic
This checks for audio+video instead of streams > 2
Fixes Ticket4090
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 4 Nov 2014 00:30:15 +0000 (01:30 +0100)]
avformat/mpegts: add scan_all_pmts option
This allows selecting if the demuxer should consider all streams to be
found after the first PMT and add further streams during decoding or if it rather
should scan all that are within the analyze-duration and other limits
Fixes Ticket3762
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
OSDN Git Service
