Michael Niedermayer
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
Michael Niedermayer
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
Diego Biurrun
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Pascal Massimino
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
Clément Bœsch
c7d8dbad14
avformat: remove FF_API_ASS_SSA dead code
2014-09-09 21:34:23 +02:00
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
5309e7e6aa
Merge commit 'f629705b0239c80fddc1b0b15ed4bb9042c77d23'
...
* commit 'f629705b0239c80fddc1b0b15ed4bb9042c77d23':
x86inc: Make INIT_CPUFLAGS support an arbitrary number of cpuflags
See: 428aa14a48
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-09 19:10:29 +02:00
Michael Niedermayer
d2f1f2c74f
Merge commit 'ec217218c27d53c5b323323e6ef862bcdbcabe5f'
...
* commit 'ec217218c27d53c5b323323e6ef862bcdbcabe5f':
x86inc: Free up variable name "n" in global namespace
See: a4dbabc8b3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-09 19:08:32 +02:00
Michael Niedermayer
87120217b5
Merge commit '176a0fca3fd64f91d585f96137388e00d8c101b6'
...
* commit '176a0fca3fd64f91d585f96137388e00d8c101b6':
x86inc: Make ym# behave the same way as xm#
See: 720c21d11f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-09 18:59:01 +02:00
Pascal Massimino
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
Gabriel Dume
ee0ebd3c14
dv: K&R formatting cosmetics
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-09-09 05:30:28 -07:00
Michael Niedermayer
881f96c4c2
avcodec/rawenc: drop sizeof(AVFrame) dependency
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-09 13:22:33 +02:00
Michael Niedermayer
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
Henrik Gramner
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
Loren Merritt
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
Henrik Gramner
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
Gabriel Dume
9752d07d33
dirac: K&R formatting cosmetics
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-09-09 01:39:47 -07:00
Michael Niedermayer
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
Antonio Ospite
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
Antonio Ospite
5a8e51f661
avdevice/x11grab: rename the "w" Window to "root" in paint_mouse_pointer
...
This specifies better the meaning of the variable, and is also in
preparation of a subsequent change which will introduce a temporary
Window variable for which "w" is an good name.
Signed-off-by: Antonio Ospite <ao2@ao2.it>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-09 02:22:01 +02:00
Michael Niedermayer
02946120fc
avfilter/vf_cropdetect: Do not check lines or columns twice on black frames
...
Idea from patch by: hjiodjf 97xgw46 <jfbvxt@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-09 02:06:17 +02:00
Michael Niedermayer
5109ce2017
avformat/mpeg: increase score for short mpeg-ps by 1
...
Fixes Ticket 3855
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-09 01:10:55 +02:00
Michael Niedermayer
6daff3bd8f
Merge commit '1ec335513f95bf2441f81d761ea127325ecd81a0'
...
* commit '1ec335513f95bf2441f81d761ea127325ecd81a0':
time: Add missing zero
Conflicts:
libavutil/time.c
See: ebef9f5a56
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-08 22:14:32 +02:00
Gabriel Dume
1ec335513f
time: Add missing zero
...
Leftover of 56d7df91e010a177a80cfc8dbe394305
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-09-08 21:46:12 +02:00
Michael Niedermayer
1360db7e88
avcodec/mpeg4videodec: fix 'libavcodec/mpeg4videodec.c:2762:22: warning: unused variable mpeg4_vdpau_class [-Wunused-const-variable]'
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-08 21:31:47 +02:00
Michael Niedermayer
a67b6c9541
avcodec/cabac_functions: fix "warning: UNCHECKED_BITSTREAM_READER is not defined, evaluates to 0"
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-08 21:06:47 +02:00
Michael Niedermayer
baee313aa9
avcodec/diracdec: Fix "warning: comparison of constant 4 with expression of type enum dirac_subband is always true [-Wtautological-constant-out-of-range-compare]"
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-08 20:47:47 +02:00
Carl Eugen Hoyos
552ce6874c
Revert the default for ffplay to -noautoexit.
...
Reviewed-by: Marton Balint
2014-09-08 17:51:12 +02:00
Carl Eugen Hoyos
42b4da75b7
Print bits_per_raw_sample for ffprobe -show_streams.
...
Fixes ticket #3919 .
2014-09-08 17:49:20 +02:00
Carl Eugen Hoyos
2b1f6a3516
Print the actual bit depth for audio if it is different from the sample_fmt bit depth.
...
This is already done for video.
2014-09-08 17:49:11 +02:00
Michael Niedermayer
5a6dd925cb
avcodec/ac3dec_fixed: remove unused arrays
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-08 16:59:16 +02:00
Michael Niedermayer
951f6fa3f3
avformat/rtpdec_qt: Fix 'warning: passing argument 2 of ffio_init_context discards const qualifier from pointer target type'
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-08 16:56:19 +02:00
Stefano Sabatini
24db666d15
MAINTAINERS: add myself as segment maintainer
2014-09-08 15:23:04 +02:00
Stefano Sabatini
f51de9cac2
lavf/segment: abort in case of invalid segment format options
2014-09-08 15:22:55 +02:00
Hendrik Leppkes
e9c08e32d6
avformat/utils: Exclude the header size when computing duration from bit_rate
...
This improves the estimate for MP3s with cover art tags.
Fixes Ticket2931
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-08 05:22:05 +02:00
Michael Niedermayer
f044fc0372
Merge commit '1274ea8dbaec44355bde07f6bb31fec0c4e6fd2d'
...
* commit '1274ea8dbaec44355bde07f6bb31fec0c4e6fd2d':
Split off floating point AAN (I)DCT into separate components
Conflicts:
configure
libavcodec/Makefile
libavcodec/dct-test.c
libavcodec/idctdsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-08 00:54:55 +02:00
Michael Niedermayer
1a59a28838
Merge commit 'fcf597625c7a991ca389f3a9b8ff4f5e383301c0'
...
* commit 'fcf597625c7a991ca389f3a9b8ff4f5e383301c0':
ismindex: Avoid writing ismf files if no base name has been specified
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-08 00:45:33 +02:00
Michael Niedermayer
aecd064744
Merge commit '803e82276b3716bf6012ec69e8854dae14a4fd2b'
...
* commit '803e82276b3716bf6012ec69e8854dae14a4fd2b':
libavformat: Check mkdir return error codes
Conflicts:
libavformat/hdsenc.c
libavformat/smoothstreamingenc.c
See: c89f8f80cc
See: a3886ea3c5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-08 00:39:26 +02:00
Reynaldo H. Verdejo Pinochet
5e7524195c
ffserver: tests, force +global_header for ASF
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
2014-09-07 18:01:43 -03:00
Diego Biurrun
1274ea8dba
Split off floating point AAN (I)DCT into separate components
2014-09-07 13:36:26 -07:00
Martin Storsjö
fcf597625c
ismindex: Avoid writing ismf files if no base name has been specified
...
Previously, this could create files named "(null).ismf", if the -ismf
parameter is specified (before an input file name), but without
specifying any base name.
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-09-07 23:20:30 +03:00
Martin Storsjö
803e82276b
libavformat: Check mkdir return error codes
...
Previously, the returned error codes were intentionally ignored
(see fadd3a6821
), to avoid aborting if the directory already
existed. If the mkdir actually failed, this was caught when
opening files within the directory fails anyway.
By handling the error code here (but explicitly ignoring EEXIST),
the error messages and return codes in these cases are more
appropriate and less confusing.
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-09-07 23:20:29 +03:00
Andreas Cadhalpun
a5b20bf4b2
doc/filters.texi: improve the wording of the expr_int_format documentation
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-07 18:29:06 +02:00
Michael Niedermayer
7c1835c52a
avformat/m4vdec: Check for non startcode 00 00 00 sequences in probe
...
Fixes miss detection of PCM as m4v
Fixes Ticket 3928
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-07 16:39:39 +02:00