rogerdpack
a1c03b9d58
ffmpeg_filter: log more information on failure to init simple filter graph
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-02 04:56:10 +02:00
Michael Niedermayer
03b2b40fd7
Merge commit 'a31c4b2cbef9aee15910fc3df52519aef46760de'
...
* commit 'a31c4b2cbef9aee15910fc3df52519aef46760de':
fate-g2m3: disable the audio stream
Conflicts:
tests/ref/fate/g2m3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-02 00:34:24 +02:00
Michael Niedermayer
838c5f3df7
avformat/utils: Redesign scoring in av_find_default_stream_index()
...
This avoids empty streams from being selected if a equivalent non empty one is available
The new system is also clearer and more systematic
This may need finetuning, which should be easy to do ...
Fixes Ticket2687
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 22:51:48 +02:00
Michael Niedermayer
52c5521877
ffmpeg_opt: Favor streams that had packets
...
Fixes Thailand-Wave.wmv without explicitly specifying a stream
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 22:43:26 +02:00
Paul B Mahol
5165c600eb
avformat/rtmpproto: increase hardcoded url/path lengths
...
Fixes #4103 .
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-07-01 20:03:26 +00:00
Janne Grunau
a31c4b2cbe
fate-g2m3: disable the audio stream
...
The audio decoder is not in fate-g2m3 dependencies and the wma2 decoder
is probably not bit-exact since it it float based.
2015-07-01 21:42:48 +02:00
Rodger Combs
c190fdf65d
lavu: Makefile: skip atomic.c if native atomics are available
...
This prevents a linker warning and skips a useless compilation
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 21:40:16 +02:00
Michael Niedermayer
06a0d5ef5c
avcodec/h264dsp_template: Fix undefined shifts
...
Fixes: asan_heap-oob_17212bc_2243_cov_594210248_h264_TTA.mkv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 20:39:25 +02:00
Michael Niedermayer
ce81e47c91
avcodec/mss2: Fix integer overflow
...
This also simplifies the code
Fixes: signal_sigabrt_7ffff6ac8cc9_2943_cov_3588637614_mss2_speech.wmv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 20:30:48 +02:00
Michael Niedermayer
f8e038f9a0
Merge commit '4e0819310e2d2eff60be2d6df28335f0739712b9'
...
* commit '4e0819310e2d2eff60be2d6df28335f0739712b9':
elsdec: Replace EOVERFLOW with INVALIDDATA
See: dec728888f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 19:53:59 +02:00
Michael Niedermayer
5142963b7d
Merge commit 'f91fe24e9bd6912c29bbb03d8afe878e045f9721'
...
* commit 'f91fe24e9bd6912c29bbb03d8afe878e045f9721':
g2meet: force simple idct for identical results over all fate configs
Conflicts:
tests/ref/fate/g2m3
tests/ref/fate/g2m4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 19:31:34 +02:00
Paul B Mahol
17e6d7b400
avfilter/vf_extractplanes: use faster path for input formats with only one component
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-07-01 17:19:52 +00:00
Paul B Mahol
fc40cdbf49
avfilter/vf_extractplanes: rename misleading variable
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-07-01 17:19:52 +00:00
Paul B Mahol
be35b8b9a9
avfilter/vf_extractplanes: support more pixel formats
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-07-01 17:19:52 +00:00
Michael Niedermayer
6205143bb3
Merge commit '9eec23b8a7fd0f91827bbc3ed0792c39a8cc9a8a'
...
* commit '9eec23b8a7fd0f91827bbc3ed0792c39a8cc9a8a':
g2meet: use av_ceil_log2 instead of a custom function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 19:09:55 +02:00
Michael Niedermayer
92c858ae66
Merge commit '4ccccd6c40a6d0ce85e96a6e37f558236e2a6a75'
...
* commit '4ccccd6c40a6d0ce85e96a6e37f558236e2a6a75':
g2meet: use an unsigned type for the djb hash
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 19:09:10 +02:00
Michael Niedermayer
9cf95654ac
Merge commit '007e27d363ba7d994019dc897dc9c39071bb204a'
...
* commit '007e27d363ba7d994019dc897dc9c39071bb204a':
avcodec: add missing CODEC_CAP_DR1 to codecs using get_buffer()
Conflicts:
libavcodec/atrac3plusdec.c
libavcodec/sp5xdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 18:58:01 +02:00
John Adlum
811008b8ee
avformat/asfdec_f: Assert that packet positions match in asf_read_pts()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 18:47:59 +02:00
John Adlum
28206b75e8
avformat/asfdec_f: Correct skip to key code
...
Fixes Ticket3978
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 18:47:54 +02:00
John Adlum
089a818bd3
avcodec/pthread_frame: Correcting typo of "occurred"
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 18:47:44 +02:00
Shivraj Patil
2eb28e889d
avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for mpegvideo functions
...
This patch adds MSA (MIPS-SIMD-Arch) optimizations for mpegvideo functions in new file mpegvideo_msa.c
Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 17:32:47 +02:00
Michael Niedermayer
4e0819310e
elsdec: Replace EOVERFLOW with INVALIDDATA
...
EOVERFLOW is not available on all platforms.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 16:26:42 +01:00
Michael Niedermayer
53fd70579b
avcodec/h264_mvpred: Fix undefined shifts in MAP_F2F
...
Fixes: asan_heap-oob_17301a3_2100_cov_3226131691_ff_add_pixels_clamped_mmx.m2ts
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 15:53:15 +02:00
Michael Niedermayer
ac78014f0b
avcodec/motion_est: Fix some undefined shifts
...
Fixes: asan_heap-oob_1dd60fd_1049_cov_4200102444_P4250048.MOV
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 15:42:07 +02:00
Janne Grunau
f91fe24e9b
g2meet: force simple idct for identical results over all fate configs
2015-07-01 15:33:20 +02:00
wm4
f91126643a
lavu: add an API function to return the FFmpeg version string
...
This returns something like "N-73264-gb54ac84". This is much more useful
than the individual library versions, of which there are too much and
which are very hard to map back to releases or git commits.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 14:58:05 +02:00
Vadim Belov
db64af6395
avformat/concatdec: copy stream metadata when using concat
...
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 14:43:31 +02:00
Michael Niedermayer
60ec3007e6
avformat/nutdec: Check ff_gen_search() for failure
...
Fixes assertion failure
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 14:28:41 +02:00
Janne Grunau
9eec23b8a7
g2meet: use av_ceil_log2 instead of a custom function
2015-07-01 13:58:34 +02:00
Michael Niedermayer
4eee685a21
avcodec/motion_est: Fix undefined shifts in cmp_inline()
...
Fixes: signal_sigsegv_35eac16_2762_cov_2704249783_missing_frames.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 13:42:06 +02:00
Michael Niedermayer
0ea099ad3e
avcodec/mpegvideo_enc: fix undefined shifts in ff_dct_quantize_c()
...
Fixes: signal_sigsegv_35eac16_2762_cov_2704249783_missing_frames.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 13:40:36 +02:00
Janne Grunau
4ccccd6c40
g2meet: use an unsigned type for the djb hash
2015-07-01 13:34:50 +02:00
Michael Niedermayer
56fd4705c0
avcodec/motion_est_template: Fix undefined shifts in CHECK_MV_DIR()
...
Fixes: signal_sigsegv_2e64ee0_2762_cov_4170502227_missing_frames.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 12:21:56 +02:00
Janne Grunau
007e27d363
avcodec: add missing CODEC_CAP_DR1 to codecs using get_buffer()
2015-07-01 12:10:25 +02:00
Michael Niedermayer
2f8c81637c
avformat/matroskadec: Fix undefined shift in read_sint()
...
Fixes: asan_heap-oob_17212bc_2243_cov_594210248_h264_TTA.mkv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 12:00:43 +02:00
Michael Niedermayer
8750aef3d6
ffmpeg_opt: Fix forcing fourccs
...
Fixes Ticket4682
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 05:10:51 +02:00
Michael Niedermayer
dec728888f
avcodec/elsdec: Remove EOVERFLOW
...
EOVERFLOW is not available on all platforms
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 04:24:58 +02:00
Michael Niedermayer
55a04a5d7a
Merge commit 'a1e2caa93e4f8102666a21222f01b74838b6497f'
...
* commit 'a1e2caa93e4f8102666a21222f01b74838b6497f':
mov: Log format rather than fourcc in stsd in trace mode
Conflicts:
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 04:15:27 +02:00
Michael Niedermayer
35c8dda5c2
Merge commit '2eef75fd7e1ac96ab9ca63bb4523078c908bc9b1'
...
* commit '2eef75fd7e1ac96ab9ca63bb4523078c908bc9b1':
mov: Adjust variable types to fix format warnings
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 04:06:42 +02:00
Michael Niedermayer
a8e137a322
Merge commit 'df22e30172b09cda4d6f7d4f43508284be65848a'
...
* commit 'df22e30172b09cda4d6f7d4f43508284be65848a':
dump: Use the correct abs() version
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 03:51:56 +02:00
Michael Niedermayer
9c010ba668
Merge commit '0d449c81b3dd25835ae6ac849cdd150f35b9c5c6'
...
* commit '0d449c81b3dd25835ae6ac849cdd150f35b9c5c6':
lavfi: Add library identifier
Conflicts:
libavfilter/version.h
See: a70b4935f1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 03:41:20 +02:00
Michael Niedermayer
818ff7ff5a
Merge commit '0f87f9b4fceee854f09da2d1ef329245196775f8'
...
* commit '0f87f9b4fceee854f09da2d1ef329245196775f8':
lavd: Add library identifier
Conflicts:
libavdevice/version.h
See: a70b4935f1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 03:40:06 +02:00
Michael Niedermayer
16dd0426e5
Merge commit '3f872c9bfa8ee1032058cfa48068b5a73ef27b5e'
...
* commit '3f872c9bfa8ee1032058cfa48068b5a73ef27b5e':
lavc: Add missing API guard to dtg_active_format option
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 03:36:32 +02:00
Michael Niedermayer
9e93e544dc
Merge commit '4d1229dabf7a7e3b6a7b326afd79102256c3b008'
...
* commit '4d1229dabf7a7e3b6a7b326afd79102256c3b008':
g2meet: Add FATE tests for all three G2M variants
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 03:26:10 +02:00
Michael Niedermayer
68939f7682
Merge commit '08c2d8f0aa679c2f060721d1d0d4f33d2ae32368'
...
* commit '08c2d8f0aa679c2f060721d1d0d4f33d2ae32368':
Go2Meeting decoder
Conflicts:
Changelog
libavcodec/g2meet.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 03:18:30 +02:00
Michael Niedermayer
3974889614
Merge commit 'e2bd03a14a4e3366df0b1ee8e284a97165be1f3c'
...
* commit 'e2bd03a14a4e3366df0b1ee8e284a97165be1f3c':
fate: Avoid unnecessary pixel format conversions
Conflicts:
tests/fate/image.mak
tests/ref/fate/dds-ya
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 03:03:20 +02:00
Michael Niedermayer
2e13a45b1a
avcodec/aacsbr: Assert that bs_num_env is positive
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 02:34:01 +02:00
Michael Niedermayer
79a98294da
avcodec/aacsbr: check that the element type matches before applying SBR
...
Fixes out of array access
Fixes: signal_sigsegv_3670fc0_2818_cov_2307326154_moon.mux
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01 02:33:45 +02:00
Vittorio Giovara
a1e2caa93e
mov: Log format rather than fourcc in stsd in trace mode
...
This will fix remaining format warnings.
2015-07-01 00:13:58 +01:00
Vittorio Giovara
2eef75fd7e
mov: Adjust variable types to fix format warnings
2015-07-01 00:13:58 +01:00