ffmpeg.git
7 years agovf_overlay: fix missed return
Michael Niedermayer [Mon, 23 Jul 2012 11:44:05 +0000 (13:44 +0200)]
vf_overlay: fix missed return

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi: change "transmedia" into "multimedia".
Nicolas George [Mon, 23 Jul 2012 09:44:48 +0000 (11:44 +0200)]
lavfi: change "transmedia" into "multimedia".

7 years agolavfi: add concat filter.
Nicolas George [Mon, 16 Jul 2012 23:05:05 +0000 (01:05 +0200)]
lavfi: add concat filter.

7 years agoffmpeg: select input file based on output time.
Nicolas George [Sat, 21 Jul 2012 20:54:08 +0000 (22:54 +0200)]
ffmpeg: select input file based on output time.

Filters can change the timings, so input files must not
necessarily be read at the same rythm. This patch select
the input file to read based on the timestamp at output
instead of input. With complex filter graphs, finding the
input for a given output is done by making a request and
checking to what buffer source it has been forwarded.

7 years agolibschroedingerenc: remove assert related to the old API.
Michael Niedermayer [Mon, 23 Jul 2012 02:20:15 +0000 (04:20 +0200)]
libschroedingerenc: remove assert related to the old API.

The assert is no longer needed as the buffer is allocated after
the size is known now.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibvorbisenc: switch to av_assert
Michael Niedermayer [Mon, 23 Jul 2012 02:00:23 +0000 (04:00 +0200)]
libvorbisenc: switch to av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibschroedingerenc: switch to av_assert
Michael Niedermayer [Mon, 23 Jul 2012 02:00:01 +0000 (04:00 +0200)]
libschroedingerenc: switch to av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agog723.1dec: Make postfilter user switchable
Michael Niedermayer [Mon, 23 Jul 2012 01:48:10 +0000 (03:48 +0200)]
g723.1dec: Make postfilter user switchable

Code from qatar (55c3a4f617171ad1138df684cbafa570807bc6a9)
Author of the code was probably Mohamed or Kostya

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agog723.1: various cosmetics and changes that should have no user vissible effect.
Michael Niedermayer [Mon, 23 Jul 2012 01:45:12 +0000 (03:45 +0200)]
g723.1: various cosmetics and changes that should have no user vissible effect.

code from qatar (55c3a4f617171ad1138df684cbafa570807bc6a9)
Author of the code was probably Mohamed or Kostya

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'dwbuiten/master'
Michael Niedermayer [Sun, 22 Jul 2012 21:59:57 +0000 (23:59 +0200)]
Merge remote-tracking branch 'dwbuiten/master'

* dwbuiten/master:
  wav: Add check for 'fmt' tag in SMV code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 22 Jul 2012 20:57:02 +0000 (22:57 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  FATE: fix the asyncts test
  build: Drop gcc-specific warning flag from header compilation rule
  FATE: add a test for the asyncts audio filter.
  matroskadec: return more correct error code on read error.
  buffersrc: check ff_get_audio_buffer() for errors.
  lavfi: check all ff_get_video_buffer() calls for errors.
  lavfi: check all avfilter_ref_buffer() calls for errors.
  vf_select: avoid an unnecessary avfilter_ref_buffer().
  buffersrc: avoid creating unnecessary buffer reference
  lavfi: use avfilter_unref_bufferp() where appropriate.
  vf_fps: add more error checks.
  vf_fps: fix a memleak on malloc failure.
  lavfi: check all ff_start_frame/draw_slice/end_frame calls for errors
  lavfi: add error handling to end_frame().
  lavfi: add error handling to draw_slice().
  lavfi: add error handling to start_frame().

Conflicts:
Makefile
ffplay.c
libavfilter/buffersrc.c
libavfilter/vf_boxblur.c
libavfilter/vf_drawtext.c
libavfilter/vf_fade.c
libavfilter/vf_frei0r.c
libavfilter/vf_hflip.c
libavfilter/vf_overlay.c
libavfilter/vf_pad.c
libavfilter/vf_scale.c
libavfilter/video.c
libavfilter/vsrc_color.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agowav: Add check for 'fmt' tag in SMV code
Derek Buitenhuis [Mon, 16 Jul 2012 18:17:52 +0000 (14:17 -0400)]
wav: Add check for 'fmt' tag in SMV code

If there is a 'SMV0' tag, but no 'fmt' tag, it is possible that
'st' got used as NULL.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
7 years agoMerge commit '1470ce21cec5ee26e106e2a884c26bbf84e5aaea'
Michael Niedermayer [Sun, 22 Jul 2012 20:10:41 +0000 (22:10 +0200)]
Merge commit '1470ce21cec5ee26e106e2a884c26bbf84e5aaea'

* commit '1470ce21cec5ee26e106e2a884c26bbf84e5aaea':
  Bump libavcodec and libavformat minor versions for G.723.1 decoder and demuxer
  G.723.1 demuxer and decoder
  Add a shift parameter to celp_lp_synthesis_filter()
  libopenjpeg: K&R formatting cosmetics
  yadif: use emms_c() instead of inline assembly for emms invocations.
  ac3: don't use different names for option tables in the template file.
  lavfi: use const for AVFilterPad declarations in all filters.
  adpcm: don't duplicate identical AVSampleFmt array for each encoder.
  configure: cosmetics: Group test dependencies together
  configure: add more passthrough flags in tms470 filter
  configure: move flag filtering functions out of if/else blocks

Conflicts:
Changelog
configure
doc/general.texi
libavcodec/Makefile
libavcodec/ac3enc_fixed.c
libavcodec/allcodecs.c
libavcodec/eac3enc.c
libavcodec/g723_1.c
libavcodec/g723_1_data.h
libavcodec/libopenjpegdec.c
libavcodec/libopenjpegenc.c
libavcodec/v210dec.h
libavcodec/version.h
libavfilter/af_anull.c
libavfilter/asrc_anullsrc.c
libavfilter/f_settb.c
libavfilter/fifo.c
libavfilter/split.c
libavfilter/src_movie.c
libavfilter/vf_aspect.c
libavfilter/vf_blackframe.c
libavfilter/vf_boxblur.c
libavfilter/vf_copy.c
libavfilter/vf_crop.c
libavfilter/vf_cropdetect.c
libavfilter/vf_delogo.c
libavfilter/vf_drawbox.c
libavfilter/vf_drawtext.c
libavfilter/vf_fade.c
libavfilter/vf_fieldorder.c
libavfilter/vf_format.c
libavfilter/vf_frei0r.c
libavfilter/vf_gradfun.c
libavfilter/vf_hflip.c
libavfilter/vf_hqdn3d.c
libavfilter/vf_libopencv.c
libavfilter/vf_lut.c
libavfilter/vf_null.c
libavfilter/vf_overlay.c
libavfilter/vf_pad.c
libavfilter/vf_pixdesctest.c
libavfilter/vf_scale.c
libavfilter/vf_select.c
libavfilter/vf_setpts.c
libavfilter/vf_showinfo.c
libavfilter/vf_slicify.c
libavfilter/vf_transpose.c
libavfilter/vf_unsharp.c
libavfilter/vf_vflip.c
libavfilter/vf_yadif.c
libavfilter/vsrc_color.c
libavfilter/vsrc_testsrc.c
libavformat/Makefile
libavformat/allformats.c
libavformat/g723_1.c
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agotls: TLS/SSL server
Peter Ross [Sun, 22 Jul 2012 04:25:12 +0000 (14:25 +1000)]
tls: TLS/SSL server

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agotls: parse uri path options to underlying tcp URLContext
Peter Ross [Sun, 22 Jul 2012 04:25:02 +0000 (14:25 +1000)]
tls: parse uri path options to underlying tcp URLContext

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agotls: verify option
Peter Ross [Sun, 22 Jul 2012 04:24:53 +0000 (14:24 +1000)]
tls: verify option

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agotls: cafile, cert, key options
Peter Ross [Sun, 22 Jul 2012 04:24:43 +0000 (14:24 +1000)]
tls: cafile, cert, key options

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agooverlay: clear cur_buf on main input link.
Nicolas George [Sun, 22 Jul 2012 15:56:59 +0000 (17:56 +0200)]
overlay: clear cur_buf on main input link.

A reference is kept in the queue and freed after use.

7 years agoFATE: fix the asyncts test
Anton Khirnov [Sun, 22 Jul 2012 09:29:06 +0000 (11:29 +0200)]
FATE: fix the asyncts test

Nellymoser is float, so use oneoff comparison instead of md5.

7 years agoav_url_split: dont let '/' char whallop '?' char
Peter Ross [Sun, 22 Jul 2012 10:51:53 +0000 (20:51 +1000)]
av_url_split: dont let '/' char whallop '?' char

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc: declare encoding for texi2html.
Nicolas George [Sun, 22 Jul 2012 10:29:22 +0000 (12:29 +0200)]
doc: declare encoding for texi2html.

It adds the following header to the HTML files:
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
which helps some browsers to display correctly the few non-ASCII
characters in the doc.

7 years agobuild: Drop gcc-specific warning flag from header compilation rule
Diego Biurrun [Sat, 21 Jul 2012 23:12:24 +0000 (01:12 +0200)]
build: Drop gcc-specific warning flag from header compilation rule

The flag was added to avoid excessive warning spam, but nowadays those
warnings no longer occur in such large numbers as to require silencing.
Besides, gcc-specific flags do not belong in the Makefiles.

7 years agolavfi: add alphaextract and alphamerge filters
Steven Robertson [Wed, 11 Jul 2012 05:14:57 +0000 (22:14 -0700)]
lavfi: add alphaextract and alphamerge filters

These filters are designed for storing and transmitting video sequences
with alpha using higher-efficiency codecs such as x264 which don't
natively support an alpha channel. 'alphaextract' takes an input stream
with an alpha channel and returns a video containing just the alpha
component as a grayscale value; 'alphamerge' takes an RGB or YUV stream
and adds an alpha channel recovered from a second grayscale stream.

Signed-off-by: Steven Robertson <steven@strobe.cc>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
7 years agodoc/filter_design: fix a few typos
Stefano Sabatini [Sun, 22 Jul 2012 09:28:57 +0000 (11:28 +0200)]
doc/filter_design: fix a few typos

7 years agolavd/caca: create display *after* checking dither options
Stefano Sabatini [Sat, 21 Jul 2012 15:16:01 +0000 (17:16 +0200)]
lavd/caca: create display *after* checking dither options

Avoid fastidious creation and immediate destroy of the display in case
one of the dither options fails to be set.

Also add NULL checks in write_trailer(), which are now necessary since
the function can be called when not all the components have been
initialized.

7 years agolavd/caca: provide more meaningful feedback if fails to set a dither option
Stefano Sabatini [Sat, 21 Jul 2012 09:04:51 +0000 (11:04 +0200)]
lavd/caca: provide more meaningful feedback if fails to set a dither option

7 years agolavd/caca: rename "colors" option to "color"
Stefano Sabatini [Sat, 21 Jul 2012 09:02:50 +0000 (11:02 +0200)]
lavd/caca: rename "colors" option to "color"

More consistent with libcaca function names. Should not harm since the
device was added less than one day ago.

7 years agolavd/caca: sort arguments for -list_dither
Stefano Sabatini [Sat, 21 Jul 2012 08:45:09 +0000 (10:45 +0200)]
lavd/caca: sort arguments for -list_dither

7 years agolavd/caca: extend error message for -list_dither option
Stefano Sabatini [Sat, 21 Jul 2012 08:44:40 +0000 (10:44 +0200)]
lavd/caca: extend error message for -list_dither option

7 years agodoc/outdevs: extend documentation for caca -list* options
Stefano Sabatini [Sat, 21 Jul 2012 08:38:04 +0000 (10:38 +0200)]
doc/outdevs: extend documentation for caca -list* options

7 years agoFATE: add a test for the asyncts audio filter.
Anton Khirnov [Thu, 5 Jul 2012 08:28:28 +0000 (10:28 +0200)]
FATE: add a test for the asyncts audio filter.

7 years agoFix yuv4mpeg parsing of 'mono16' files.
Steven Robertson [Sun, 22 Jul 2012 07:59:25 +0000 (09:59 +0200)]
Fix yuv4mpeg parsing of 'mono16' files.

'mono' came before 'mono16' in the list of colorspace alternatives,
causing files of the latter type to be parsed as the former.

7 years agomatroskadec: return more correct error code on read error.
Anton Khirnov [Sat, 21 Jul 2012 08:48:39 +0000 (10:48 +0200)]
matroskadec: return more correct error code on read error.

7 years agobuffersrc: check ff_get_audio_buffer() for errors.
Anton Khirnov [Sun, 15 Jul 2012 09:29:10 +0000 (11:29 +0200)]
buffersrc: check ff_get_audio_buffer() for errors.

7 years agolavfi: check all ff_get_video_buffer() calls for errors.
Anton Khirnov [Sun, 15 Jul 2012 09:16:53 +0000 (11:16 +0200)]
lavfi: check all ff_get_video_buffer() calls for errors.

7 years agolavfi: check all avfilter_ref_buffer() calls for errors.
Anton Khirnov [Sun, 15 Jul 2012 09:16:53 +0000 (11:16 +0200)]
lavfi: check all avfilter_ref_buffer() calls for errors.

7 years agovf_select: avoid an unnecessary avfilter_ref_buffer().
Anton Khirnov [Sun, 15 Jul 2012 09:00:49 +0000 (11:00 +0200)]
vf_select: avoid an unnecessary avfilter_ref_buffer().

7 years agobuffersrc: avoid creating unnecessary buffer reference
Anton Khirnov [Sun, 15 Jul 2012 08:28:17 +0000 (10:28 +0200)]
buffersrc: avoid creating unnecessary buffer reference

7 years agolavfi: use avfilter_unref_bufferp() where appropriate.
Anton Khirnov [Sun, 15 Jul 2012 08:12:51 +0000 (10:12 +0200)]
lavfi: use avfilter_unref_bufferp() where appropriate.

7 years agovf_fps: add more error checks.
Anton Khirnov [Sun, 15 Jul 2012 08:07:59 +0000 (10:07 +0200)]
vf_fps: add more error checks.

7 years agovf_fps: fix a memleak on malloc failure.
Anton Khirnov [Sun, 15 Jul 2012 07:50:49 +0000 (09:50 +0200)]
vf_fps: fix a memleak on malloc failure.

7 years agolavfi: check all ff_start_frame/draw_slice/end_frame calls for errors
Anton Khirnov [Sun, 15 Jul 2012 07:47:01 +0000 (09:47 +0200)]
lavfi: check all ff_start_frame/draw_slice/end_frame calls for errors

7 years agolavfi: add error handling to end_frame().
Anton Khirnov [Sat, 14 Jul 2012 07:25:33 +0000 (09:25 +0200)]
lavfi: add error handling to end_frame().

7 years agolavfi: add error handling to draw_slice().
Anton Khirnov [Sat, 14 Jul 2012 07:25:33 +0000 (09:25 +0200)]
lavfi: add error handling to draw_slice().

7 years agolavfi: add error handling to start_frame().
Anton Khirnov [Sun, 8 Jul 2012 15:29:42 +0000 (17:29 +0200)]
lavfi: add error handling to start_frame().

7 years agoBump libavcodec and libavformat minor versions for G.723.1 decoder and demuxer
Kostya Shishkov [Sun, 22 Jul 2012 06:06:19 +0000 (08:06 +0200)]
Bump libavcodec and libavformat minor versions for G.723.1 decoder and demuxer

7 years agoG.723.1 demuxer and decoder
Mohamed Naufal Basheer [Thu, 17 Mar 2011 22:56:50 +0000 (23:56 +0100)]
G.723.1 demuxer and decoder

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
7 years agoAdd a shift parameter to celp_lp_synthesis_filter()
Mohamed Naufal Basheer [Tue, 10 Jul 2012 17:58:39 +0000 (19:58 +0200)]
Add a shift parameter to celp_lp_synthesis_filter()

This is intended for reuse by the G.723.1 decoder

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
7 years agoatrac3: switch to av_assert
Michael Niedermayer [Sun, 22 Jul 2012 03:23:27 +0000 (05:23 +0200)]
atrac3: switch to av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agokbdwin: switch to av_assert
Michael Niedermayer [Sun, 22 Jul 2012 03:18:01 +0000 (05:18 +0200)]
kbdwin: switch to av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 22 Jul 2012 03:01:09 +0000 (05:01 +0200)]
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>
7 years agolibopenjpeg: K&R formatting cosmetics
Luca Barbato [Thu, 19 Jul 2012 20:22:08 +0000 (22:22 +0200)]
libopenjpeg: K&R formatting cosmetics

7 years agotscc: employ more meaningful return values
Paul B Mahol [Sat, 21 Jul 2012 04:16:26 +0000 (04:16 +0000)]
tscc: employ more meaningful return values

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoyadif: use emms_c() instead of inline assembly for emms invocations.
Ronald S. Bultje [Sun, 22 Jul 2012 00:04:06 +0000 (17:04 -0700)]
yadif: use emms_c() instead of inline assembly for emms invocations.

7 years agopthread: mark lockless thread synchronization variables as volatile
Michael Niedermayer [Tue, 17 Jul 2012 14:10:49 +0000 (16:10 +0200)]
pthread: mark lockless thread synchronization variables as volatile

No speed difference was meassureable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoac3: don't use different names for option tables in the template file.
Ronald S. Bultje [Sat, 21 Jul 2012 23:42:36 +0000 (16:42 -0700)]
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.

7 years agolavfi: use const for AVFilterPad declarations in all filters.
Ronald S. Bultje [Sat, 21 Jul 2012 16:45:52 +0000 (09:45 -0700)]
lavfi: use const for AVFilterPad declarations in all filters.

7 years agoadpcm: don't duplicate identical AVSampleFmt array for each encoder.
Ronald S. Bultje [Sat, 21 Jul 2012 15:56:18 +0000 (08:56 -0700)]
adpcm: don't duplicate identical AVSampleFmt array for each encoder.

7 years agoconfigure: cosmetics: Group test dependencies together
Diego Biurrun [Tue, 10 Jul 2012 20:18:42 +0000 (22:18 +0200)]
configure: cosmetics: Group test dependencies together

7 years agoconfigure: add more passthrough flags in tms470 filter
Mans Rullgard [Fri, 20 Jul 2012 00:27:53 +0000 (01:27 +0100)]
configure: add more passthrough flags in tms470 filter

This is in preparation for following changes.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoconfigure: move flag filtering functions out of if/else blocks
Mans Rullgard [Wed, 18 Jul 2012 19:27:09 +0000 (20:27 +0100)]
configure: move flag filtering functions out of if/else blocks

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agox86: swscale: Place inline assembly code under appropriate #ifdefs
Ronald S. Bultje [Sun, 15 Jul 2012 04:25:55 +0000 (21:25 -0700)]
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>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 21 Jul 2012 20:19:19 +0000 (22:19 +0200)]
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>
7 years agovf_overlay: prevent premature freeing of cur_buf
Michael Niedermayer [Sat, 21 Jul 2012 20:00:10 +0000 (22:00 +0200)]
vf_overlay: prevent premature freeing of cur_buf

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovf_overlay: use unref_bufferP()
Michael Niedermayer [Sat, 21 Jul 2012 19:59:46 +0000 (21:59 +0200)]
vf_overlay: use unref_bufferP()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosink_buffer: prevent prematurely freeing of cur_buf
Michael Niedermayer [Sat, 21 Jul 2012 19:39:11 +0000 (21:39 +0200)]
sink_buffer: prevent prematurely freeing of cur_buf

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovf_thumbnail: prevent premature freeing of ref
Michael Niedermayer [Sat, 21 Jul 2012 19:38:19 +0000 (21:38 +0200)]
vf_thumbnail: prevent premature freeing of ref

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovf_colormatrix: avoid using out_buf
Michael Niedermayer [Sat, 21 Jul 2012 19:35:05 +0000 (21:35 +0200)]
vf_colormatrix: avoid using out_buf

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agortsp: remove terminal comma in FF_RTP_FLAG_OPTS macro.
Ronald S. Bultje [Sat, 21 Jul 2012 14:13:48 +0000 (14:13 +0000)]
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>
7 years agozerocodec: fix direct rendering.
Reimar Döffinger [Sat, 21 Jul 2012 11:22:04 +0000 (13:22 +0200)]
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>
7 years agoconfigure: Remove redundant RTMPT/RTMPTS dependencies
Samuel Pitoiset [Thu, 19 Jul 2012 12:16:01 +0000 (14:16 +0200)]
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>
7 years agoconfigure: add filtering of host cflags/ldflags
Mans Rullgard [Fri, 20 Jul 2012 12:48:13 +0000 (13:48 +0100)]
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>
7 years agolibopenjpegdec: set cp_reduce value only once
Paul B Mahol [Sat, 21 Jul 2012 16:12:04 +0000 (16:12 +0000)]
libopenjpegdec: set cp_reduce value only once

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoiff: pass context to av_log_ask_for_sample
Paul B Mahol [Sat, 21 Jul 2012 16:05:22 +0000 (16:05 +0000)]
iff: pass context to av_log_ask_for_sample

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoconfigure: initialise all flag filters at the same place
Mans Rullgard [Fri, 20 Jul 2012 11:20:23 +0000 (12:20 +0100)]
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>
7 years agoconfigure: add filtering of linker flags
Mans Rullgard [Fri, 20 Jul 2012 02:06:49 +0000 (03:06 +0100)]
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>
7 years agoconfigure: name some variables more consistently
Mans Rullgard [Fri, 20 Jul 2012 11:02:18 +0000 (12:02 +0100)]
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>
7 years agoconfigure: remove filter_cppflags
Mans Rullgard [Fri, 20 Jul 2012 11:02:29 +0000 (12:02 +0100)]
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>
7 years agoconfigure: set icc_version where it is needed
Mans Rullgard [Wed, 18 Jul 2012 19:40:38 +0000 (20:40 +0100)]
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>
7 years agompegenc: remove disabled code
Diego Biurrun [Fri, 29 Jul 2011 10:01:37 +0000 (12:01 +0200)]
mpegenc: remove disabled code

7 years agoiff: remove dupe ID_ANNO definition
Paul B Mahol [Sat, 21 Jul 2012 10:30:12 +0000 (10:30 +0000)]
iff: remove dupe ID_ANNO definition

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agodoc/outdevs: fix @code{} syntax in caca device docs
Stefano Sabatini [Sat, 21 Jul 2012 08:17:02 +0000 (10:17 +0200)]
doc/outdevs: fix @code{} syntax in caca device docs

7 years agoChangelog: add entry for the caca device
Stefano Sabatini [Sat, 21 Jul 2012 08:15:44 +0000 (10:15 +0200)]
Changelog: add entry for the caca device

7 years agoalacdec: fix packed sample output with 5.1
Michael Niedermayer [Sat, 21 Jul 2012 04:39:01 +0000 (06:39 +0200)]
alacdec: fix packed sample output with 5.1

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoriff: add G723_1 wav tag
Piotr Bandurski [Fri, 20 Jul 2012 22:45:34 +0000 (00:45 +0200)]
riff: add G723_1 wav tag

Reveiwed-by: compn <tempn@twmi.rr.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoac3dec: set decode_error_flags field in ac3 codec
Marton Balint [Fri, 20 Jul 2012 21:28:03 +0000 (23:28 +0200)]
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>
7 years agoavcodec: add decode_error_flags field to AVFrame
Marton Balint [Fri, 20 Jul 2012 21:28:02 +0000 (23:28 +0200)]
avcodec: add decode_error_flags field to AVFrame

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibcaca output device
Paul B Mahol [Tue, 13 Mar 2012 21:45:46 +0000 (21:45 +0000)]
libcaca output device

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 21 Jul 2012 00:49:57 +0000 (02:49 +0200)]
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>
7 years agotiertexseq: remove redundant string from log message
Paul B Mahol [Fri, 20 Jul 2012 19:44:26 +0000 (19:44 +0000)]
tiertexseq: remove redundant string from log message

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolavfi: unref AVFilterLink.out_buf in ff_end_frame().
Anton Khirnov [Sat, 14 Jul 2012 15:09:43 +0000 (17:09 +0200)]
lavfi: unref AVFilterLink.out_buf in ff_end_frame().

This reduces code duplication and prevents stale pointers from remaining
on the link.

7 years agov4l2: remove call to v4l2_fd_open.
Nicolas George [Fri, 20 Jul 2012 08:55:59 +0000 (10:55 +0200)]
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.

7 years agolavfi: unref AVFilterLink.cur_buf in ff_end_frame().
Anton Khirnov [Sat, 14 Jul 2012 15:09:43 +0000 (17:09 +0200)]
lavfi: unref AVFilterLink.cur_buf in ff_end_frame().

This reduces code duplication and prevents stale pointers from remaining
on the link.

7 years agovsrc_testsrc: avoid an unnecessary avfilter_ref_buffer().
Anton Khirnov [Sun, 15 Jul 2012 09:12:10 +0000 (11:12 +0200)]
vsrc_testsrc: avoid an unnecessary avfilter_ref_buffer().

7 years agovf_slicify: clear AVFilterLink.cur_buf in start_frame().
Anton Khirnov [Wed, 11 Jul 2012 07:58:43 +0000 (09:58 +0200)]
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.

7 years agovf_settb: simplify start_frame().
Anton Khirnov [Wed, 11 Jul 2012 09:00:48 +0000 (11:00 +0200)]
vf_settb: simplify start_frame().

Avoid pointless filter ref/unref. Just use the reference passed to
start_frame().

7 years agovf_fieldorder: don't give up its own reference to the output buffer.
Anton Khirnov [Sun, 8 Jul 2012 15:01:17 +0000 (17:01 +0200)]
vf_fieldorder: don't give up its own reference to the output buffer.

7 years agovf_pad: don't give up its own reference to the output buffer.
Anton Khirnov [Sun, 8 Jul 2012 15:01:17 +0000 (17:01 +0200)]
vf_pad: don't give up its own reference to the output buffer.

7 years agovf_overlay: don't access a buffer reference that's been given away.
Anton Khirnov [Sun, 8 Jul 2012 03:34:20 +0000 (05:34 +0200)]
vf_overlay: don't access a buffer reference that's been given away.

7 years agovf_drawtext: don't give up its own reference to the input buffer.
Anton Khirnov [Sun, 8 Jul 2012 02:20:22 +0000 (04:20 +0200)]
vf_drawtext: don't give up its own reference to the input buffer.

Directly forwarding the input buffer to the next filter means that
drawtext no longer owns any references to it and thus shouldn't refer to
it in any way.