ceb2fe027f
avcodec/bmp_parser: delay frame end detection to the next header or EOF
...
Fixes Ticket3687
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-13 17:46:18 +02:00
3c6d824b80
avcodec/bmp_parser: simplify
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-13 17:21:31 +02:00
b11d1889ef
avcodec/bmp_parser: fix parsing a single bmp which has a fsize < its header
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-13 17:10:13 +02:00
d86cf4a91d
avformat/vobsub: fix NULL dereference
2014-09-13 15:15:32 +02:00
8572dbc5db
avcodec/ac3en: use FF_ALLOC(Z)_ARRAY()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-13 13:28:38 +02:00
bcac0f4010
lavf/format.c: use AVPROBE_SCORE_MIME instead of AVPROBE_SCORE_EXTENSION for matching mime types
...
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-13 00:37:35 +02:00
d5e802609a
doc: document the addition of the AVProbeData.mime_type field and it's implications
...
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-13 00:36:14 +02:00
cdb3eee7c4
configure: Fix miscompilation for i586
...
If the CPU is 386, 486 or pentium, we must not use cmov in inline
assembler.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-12 22:57:31 +02:00
b3fd2b175c
avformat/img2dec: Fail probing when no data is yet available and the filename contains no number/glob patterns either.
...
Fixes Ticket3901
the seek test error codes change due to a change in the failure path,
this could be avoided by changing the respective error codes to EINVAL
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-12 19:01:44 +02:00
917d14e6a2
avformat/format: Run image2 probe again when file content data is available
...
Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-12 18:20:38 +02:00
321c3cd1a9
avformat/img2dec: reduce bmppipe probe score
...
bmp pipe needs the bmp parser which is not bug free and should thus not be favored
over the bmp image2 demuxer
that also means this change could be reverted in case bmp pipe is improved so it
handles all single bmp images correctly
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-12 18:19:11 +02:00
e3fb2b0eb7
docs: add example around the suggested commit message format
...
It gets rendered inline in HTML and becomes not very clear.
Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-12 01:59:44 +02:00
453944cc77
configure: fix check_cmd in check_host_cpp
...
Use correct cpp and c flags variables for the host libc.
Signed-off-by: Jörg Krause <jkrause@posteo.de>
Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-11 18:42:23 +02:00
8e8db16a2c
avutil/ppc/float_dsp_altivec: ppc: Fix bug in ff_vector_fmul_add_altivec() affecting little endian environments on POWER8
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-11 18:36:34 +02:00
4a203b7737
avcodec/png_parser: Return the buffered data at the end
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-11 16:47:01 +02:00
a6153bde3d
avcodec/pngdec: print the actual number of bytes left in the error case
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-11 16:47:01 +02:00
de4a4ca1a0
avformat/img2_alias_pix: Add AVClass and image2 AVOptions
...
This fixes the default timebase and allows overriding the framerate
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-11 15:34:13 +02:00
8b4714614f
avformat/img2_alias & brender_pix: fix function names
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-11 15:16:24 +02:00
646d663f71
avformat/img2_brender_pix: Add AVClass and image2 AVOptions
...
This fixes the default timebase and allows overriding the framerate
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-11 15:10:59 +02:00
5303a644f5
avformat/img2: Make AVOptions available to img* demuxers defined in other files
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-11 15:10:15 +02:00
ea7ebadeb7
avformat/rmdec: very basic MLTI support
...
Fixes Ticket2152
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-11 14:13:03 +02:00
16de4d927e
ffmpeg: Do av_buffersink_set_frame_size() when reconfiguring the filtergraph not just when changing audio resample parameters
...
Fixes Ticket3562
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-11 04:55:58 +02:00
5e3da25618
Merge commit '775a0b04f0cf8102fe322b2ee03fe1a0633dea04'
...
* commit '775a0b04f0cf8102fe322b2ee03fe1a0633dea04':
doc: Fix syntax and logical errors in avconv stream combination example
Conflicts:
doc/ffmpeg.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-11 01:27:38 +02:00
3e56ae67d3
avcodec/h264: Use FF_ALLOCZ_ARRAY_OR_GOTO()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-10 22:37:35 +02:00
7258b5eb65
avcodec/dnxhdenc: Use FF_ALLOCZ_ARRAY_OR_GOTO()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-10 22:37:35 +02:00
743d489c9a
avcodec/mpegvideo: Use FF_ALLOCZ_ARRAY_OR_GOTO()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-10 20:50:32 +02:00
6f48c60956
avcodec/twinvq: Use FF_ALLOC_ARRAY_OR_GOTO()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-10 20:44:19 +02:00
775a0b04f0
doc: Fix syntax and logical errors in avconv stream combination example
...
Bug-Id: 661
CC: libav-stable@libav.org
2014-09-10 20:30:36 +02:00
c4a0c64f14
avcodec/aacenc: Use FF_ALLOCZ_ARRAY_OR_GOTO()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-10 15:18:29 +02:00
7fe59eeaaf
avcodec/ac3enc_template: Use FF_ALLOC_ARRAY_OR_GOTO()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-10 15:18:29 +02:00
8b7a39d7ea
avcodec/adpcmenc: Use FF_ALLOC_ARRAY_OR_GOTO()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-10 15:18:29 +02:00
3294fc8c47
avformat/concatdec: fix "warning: explicitly assigning a variable of type int to itself"
...
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-10 11:48:39 +02:00
1b5ccae0f2
avformat/mp3dec: Improve seeking frame sync code
...
Fixes Ticket3884
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-10 02:32:41 +02:00
649b7a9946
av_filter/x86/idet: use HADDD where appropriate
...
Signed-off-by: James Almer <jamrial@gmail.com>
2014-09-09 19:02:49 -03:00
c7d8dbad14
avformat: remove FF_API_ASS_SSA dead code
2014-09-09 21:34:23 +02:00
35a9959aca
avcodec/snow: make new_picture const
...
Fixes "assignment discards const qualifier from pointer target type"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-09 21:02:37 +02:00
96b069450c
Merge commit 'ee0ebd3c1412fdd9d80aa97c98d1a20b893f1f47'
...
* commit 'ee0ebd3c1412fdd9d80aa97c98d1a20b893f1f47':
dv: K&R formatting cosmetics
Conflicts:
libavcodec/dv.c
libavcodec/dv.h
libavcodec/dv_profile.c
libavcodec/dvdec.c
libavcodec/dvenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-09 19:30:55 +02:00
5309e7e6aa
Merge commit 'f629705b0239c80fddc1b0b15ed4bb9042c77d23'
...
* commit 'f629705b0239c80fddc1b0b15ed4bb9042c77d23':
x86inc: Make INIT_CPUFLAGS support an arbitrary number of cpuflags
See: 428aa14a48
2014-09-09 19:10:29 +02:00
d2f1f2c74f
Merge commit 'ec217218c27d53c5b323323e6ef862bcdbcabe5f'
...
* commit 'ec217218c27d53c5b323323e6ef862bcdbcabe5f':
x86inc: Free up variable name "n" in global namespace
See: a4dbabc8b3
2014-09-09 19:08:32 +02:00
87120217b5
Merge commit '176a0fca3fd64f91d585f96137388e00d8c101b6'
...
* commit '176a0fca3fd64f91d585f96137388e00d8c101b6':
x86inc: Make ym# behave the same way as xm#
See: 720c21d11f
2014-09-09 18:59:01 +02:00
e3fd6a3a4e
av_filter/x86/idet: MMX/SSE2 implementation of 16bits filter_line()
...
tested on http://ps-auxw.de/10bit-h264-sample/10bit-eldorado.mkv
MMX: ~30% faster decoding overall
SSE2:~40% faster
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-09 16:47:22 +02:00
ee0ebd3c14
dv: K&R formatting cosmetics
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-09-09 05:30:28 -07:00
881f96c4c2
avcodec/rawenc: drop sizeof(AVFrame) dependency
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-09 13:22:33 +02:00
b63052839a
Merge commit '9752d07d33d5370f7819865fbb5e582b982aad06'
...
* commit '9752d07d33d5370f7819865fbb5e582b982aad06':
dirac: K&R formatting cosmetics
Conflicts:
libavcodec/dirac.c
libavcodec/dirac_parser.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-09 12:12:29 +02:00
f629705b02
x86inc: Make INIT_CPUFLAGS support an arbitrary number of cpuflags
...
Previously there was a limit of two cpuflags.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-09-09 02:00:25 -07:00
ec217218c2
x86inc: Free up variable name "n" in global namespace
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-09-09 02:00:19 -07:00
176a0fca3f
x86inc: Make ym# behave the same way as xm#
...
This makes more sense for future implementations of templates with zmm registers.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-09-09 01:45:14 -07:00
9752d07d33
dirac: K&R formatting cosmetics
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-09-09 01:39:47 -07:00
f7bbe0f414
avformat/mpeg: update comment on probe score
...
Found-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-09 02:51:59 +02:00
69c34a6ac9
avdevice/x11grab: fix cursor drawing in multi-screen setup
...
The code uses XFixes to retrieve the cursor coordinates, but XFixes
gives no information of what screen the pointer is on; this results in
always drawing the cursor on the captured screen even if the mouse
pointer was on another screen.
For example, when capturing from screen 1 (i.e. -f x11grab -i ":0.1")
the cursor was being drawn in the captured image even when the mouse
pointer was actually on screen 0, which is wrong and visually confusing.
Use XQueryPointer to check that the pointer is actually on the screen
which is being captured.
Signed-off-by: Antonio Ospite <ao2@ao2.it>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-09 02:22:06 +02:00
Michael Niedermayer
Clément Bœsch
Andreas Cadhalpun
Mikulas Patocka
James Darnley
Jörg Krause
Rong Yan
Diego Biurrun
Pascal Massimino
Gabriel Dume
Henrik Gramner
Loren Merritt
Antonio Ospite