Michael Niedermayer
2f48dff455
atrac3: switch to av_assert
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-22 05:23:27 +02:00
Michael Niedermayer
86af292883
kbdwin: switch to av_assert
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-22 05:18:01 +02:00
Michael Niedermayer
32c3038734
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
x86: swscale: Place inline assembly code under appropriate #ifdefs
rtsp: remove terminal comma in FF_RTP_FLAG_OPTS macro.
configure: Remove redundant RTMPT/RTMPTS dependencies
configure: add filtering of host cflags/ldflags
configure: initialise all flag filters at the same place
configure: add filtering of linker flags
configure: name some variables more consistently
configure: remove filter_cppflags
configure: set icc_version where it is needed
mpegenc: remove disabled code
Conflicts:
configure
libavformat/movenc.c
libswscale/x86/swscale_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-22 05:05:02 +02:00
Luca Barbato
51a5ddfa01
libopenjpeg: K&R formatting cosmetics
2012-07-22 04:05:45 +02:00
Paul B Mahol
1aeb87fa07
tscc: employ more meaningful return values
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-07-22 01:21:53 +00:00
Ronald S. Bultje
731fa116b4
yadif: use emms_c() instead of inline assembly for emms invocations.
2012-07-21 17:16:49 -07:00
Michael Niedermayer
7c71f8e0ec
pthread: mark lockless thread synchronization variables as volatile
...
No speed difference was meassureable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-22 02:07:02 +02:00
Ronald S. Bultje
b170b323e3
ac3: don't use different names for option tables in the template file.
...
The variables which are declared in the teplate file are static and
therefore there is no symbol clash.
2012-07-21 16:42:36 -07:00
Ronald S. Bultje
3db407038e
lavfi: use const for AVFilterPad declarations in all filters.
2012-07-21 16:31:15 -07:00
Ronald S. Bultje
98041afb5f
adpcm: don't duplicate identical AVSampleFmt array for each encoder.
2012-07-21 16:31:15 -07:00
Diego Biurrun
388ff813e7
configure: cosmetics: Group test dependencies together
2012-07-21 22:49:31 +02:00
Mans Rullgard
ad93dccb64
configure: add more passthrough flags in tms470 filter
...
This is in preparation for following changes.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-07-21 21:33:04 +01:00
Mans Rullgard
d0c6d424f4
configure: move flag filtering functions out of if/else blocks
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-07-21 21:33:01 +01:00
Ronald S. Bultje
b2668c85e9
x86: swscale: Place inline assembly code under appropriate #ifdefs
...
Fixes compilation for compilers that do not support gcc inline assembly.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2012-07-21 22:22:58 +02:00
Michael Niedermayer
9e1508f1e7
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
lavfi: unref AVFilterLink.out_buf in ff_end_frame().
lavfi: unref AVFilterLink.cur_buf in ff_end_frame().
vsrc_testsrc: avoid an unnecessary avfilter_ref_buffer().
vf_slicify: clear AVFilterLink.cur_buf in start_frame().
vf_settb: simplify start_frame().
vf_fieldorder: don't give up its own reference to the output buffer.
vf_pad: don't give up its own reference to the output buffer.
vf_overlay: don't access a buffer reference that's been given away.
vf_drawtext: don't give up its own reference to the input buffer.
vf_gradfun: don't store two pointers to one AVFilterBufferRef.
vf_delogo: don't store two pointers to one AVFilterBufferRef.
vf_aspect: clear AVFilterLink.cur_buf in start_frame().
lavfi: add avfilter_unref_bufferp()
Conflicts:
doc/APIchanges
libavfilter/avfilter.h
libavfilter/buffer.c
libavfilter/vf_aspect.c
libavfilter/vf_drawtext.c
libavfilter/vf_overlay.c
libavfilter/vf_pad.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-21 22:20:49 +02:00
Michael Niedermayer
f7e0c18549
vf_overlay: prevent premature freeing of cur_buf
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-21 22:17:57 +02:00
Michael Niedermayer
0ecaa447f6
vf_overlay: use unref_bufferP()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-21 22:17:53 +02:00
Michael Niedermayer
dc49105c7f
sink_buffer: prevent prematurely freeing of cur_buf
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-21 22:17:36 +02:00
Michael Niedermayer
1890853976
vf_thumbnail: prevent premature freeing of ref
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-21 22:17:31 +02:00
Michael Niedermayer
5aab307f30
vf_colormatrix: avoid using out_buf
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-21 22:17:28 +02:00
Ronald S. Bultje
5354a904fe
rtsp: remove terminal comma in FF_RTP_FLAG_OPTS macro.
...
This makes usage of the macro look more natural when
used with array entries.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2012-07-21 15:35:01 -04:00
Reimar Döffinger
313d1981ad
zerocodec: fix direct rendering.
...
Set picture type before calling get_buffer.
This allows the DR application to make better decisions.
It also fixes a resource leak in case of missing reference frames
since it would call get_buffer but never release_buffer.
Also use FFSWAP to ensure that the AVFrame is properly initialized
in the next get_buffer (in particular that data[0] is NULL).
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2012-07-21 21:11:37 +02:00
Samuel Pitoiset
bdbb21b186
configure: Remove redundant RTMPT/RTMPTS dependencies
...
The incompatibility with librtmp is already expressed in the ffrtmphttp
protocol dependency declaration, which both RTMPT and RTMPTS depend on.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2012-07-21 18:29:05 +02:00
Mans Rullgard
6c3fa06a85
configure: add filtering of host cflags/ldflags
...
This is in preparation for supporting host compilers with
non-standard flags.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-07-21 17:18:55 +01:00
Paul B Mahol
a36f19e942
libopenjpegdec: set cp_reduce value only once
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-07-21 16:12:04 +00:00
Paul B Mahol
881e0de640
iff: pass context to av_log_ask_for_sample
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-07-21 16:06:36 +00:00
Mans Rullgard
68485d1f32
configure: initialise all flag filters at the same place
...
This is more consistent, and doing it earlier is harmless.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-07-21 16:54:49 +01:00
Mans Rullgard
64933b6c94
configure: add filtering of linker flags
...
This allows filtering of linker flags the same was as already
supported for CFLAGS. The filter must be initialised to 'echo'
early since it is invoked by --extra-ldflags.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-07-21 16:54:16 +01:00
Mans Rullgard
01d31e16f1
configure: name some variables more consistently
...
Name variables pertaining to various types of flags with 'cflags' etc
as prefix instead of suffix.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-07-21 16:49:45 +01:00
Mans Rullgard
cd52ec95bb
configure: remove filter_cppflags
...
This is not used and the current design would not work properly
if mixing tools needing different filters.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-07-21 16:49:30 +01:00
Mans Rullgard
07e3f9af9f
configure: set icc_version where it is needed
...
This variable is only used once, so setting it there is clearer.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-07-21 16:48:42 +01:00
Diego Biurrun
1cf6e7dd37
mpegenc: remove disabled code
2012-07-21 16:34:29 +02:00
Paul B Mahol
ad69e778b7
iff: remove dupe ID_ANNO definition
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-07-21 10:30:12 +00:00
Stefano Sabatini
beef7a6328
doc/outdevs: fix @code{} syntax in caca device docs
2012-07-21 10:17:02 +02:00
Stefano Sabatini
f1a7124d30
Changelog: add entry for the caca device
2012-07-21 10:15:44 +02:00
Michael Niedermayer
17352ad315
alacdec: fix packed sample output with 5.1
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-21 06:39:01 +02:00
Piotr Bandurski
3800facac6
riff: add G723_1 wav tag
...
Reveiwed-by: compn <tempn@twmi.rr.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-21 05:48:31 +02:00
Marton Balint
b99e9ee938
ac3dec: set decode_error_flags field in ac3 codec
...
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-21 05:48:31 +02:00
Marton Balint
016a472009
avcodec: add decode_error_flags field to AVFrame
...
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-21 05:48:31 +02:00
Paul B Mahol
296c1b6bd1
libcaca output device
2012-07-21 03:33:02 +00:00
Michael Niedermayer
3c033d00f5
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
libopenjpeg: introduce lowres and lowqual private options
FATE: add a test for flac cover art.
cafdec: allow larger ALAC magic cookie
alac: fix channel pointer assignment for 24 and 32-bit
Conflicts:
libavcodec/alac.c
libavcodec/libopenjpegdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-21 04:25:11 +02:00
Paul B Mahol
85761efa95
tiertexseq: remove redundant string from log message
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-07-20 19:44:26 +00:00
Anton Khirnov
4c9080a7ef
lavfi: unref AVFilterLink.out_buf in ff_end_frame().
...
This reduces code duplication and prevents stale pointers from remaining
on the link.
2012-07-20 21:12:49 +02:00
Nicolas George
fd58678b86
v4l2: remove call to v4l2_fd_open.
...
v4l2_fd_open is already called at the end of v4l2_open;
calling a second time leaks structures inside libv4l2.
Fix trac ticket #1560 .
2012-07-20 21:12:10 +02:00
Anton Khirnov
07bad27810
lavfi: unref AVFilterLink.cur_buf in ff_end_frame().
...
This reduces code duplication and prevents stale pointers from remaining
on the link.
2012-07-20 21:10:42 +02:00
Anton Khirnov
533fd5b5b4
vsrc_testsrc: avoid an unnecessary avfilter_ref_buffer().
2012-07-20 21:09:57 +02:00
Anton Khirnov
5b50ae94e6
vf_slicify: clear AVFilterLink.cur_buf in start_frame().
...
The buffer is passed on to the next filter, so we shouldn't keep any
pointers to it.
2012-07-20 21:09:48 +02:00
Anton Khirnov
0393af4f0b
vf_settb: simplify start_frame().
...
Avoid pointless filter ref/unref. Just use the reference passed to
start_frame().
2012-07-20 21:08:50 +02:00
Anton Khirnov
9203fa0b32
vf_fieldorder: don't give up its own reference to the output buffer.
2012-07-20 21:08:26 +02:00
Anton Khirnov
f493c644cd
vf_pad: don't give up its own reference to the output buffer.
2012-07-20 21:08:13 +02:00