xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-27 13:30:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
42,807 Commits 31 Branches 338 Tags 298 MiB
f4451d2e75
Commit Graph

42807 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
f4451d2e75 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>
 2012-07-23 04:20:15 +02:00
Michael Niedermayer
d014e19515 libvorbisenc: switch to av_assert 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-23 04:00:23 +02:00
Michael Niedermayer
72a9e646c3 libschroedingerenc: switch to av_assert 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-23 04:00:01 +02:00
Michael Niedermayer
62514ca012 g723.1dec: Make postfilter user switchable 
Code from qatar (55c3a4f617)
Author of the code was probably Mohamed or Kostya

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-23 03:57:04 +02:00
Michael Niedermayer
1eb1392690 g723.1: various cosmetics and changes that should have no user vissible effect. 
code from qatar (55c3a4f617)
Author of the code was probably Mohamed or Kostya

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-23 03:55:28 +02:00
Michael Niedermayer
d486a6eae9 Merge remote-tracking branch 'dwbuiten/master' 
* dwbuiten/master:
  wav: Add check for 'fmt' tag in SMV code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-23 00:00:03 +02:00
Michael Niedermayer
88beb2df98 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>
 2012-07-22 23:56:21 +02:00
Derek Buitenhuis
5ab855777d 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>
 2012-07-22 17:46:26 -04:00
Michael Niedermayer
9023de342f 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>
 2012-07-22 22:18:18 +02:00
Peter Ross
4f4eb380f0 tls: TLS/SSL server 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-22 19:12:15 +02:00
Peter Ross
d1146d67ca tls: parse uri path options to underlying tcp URLContext 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-22 19:12:15 +02:00
Peter Ross
b2460858f6 tls: verify option 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-22 19:12:15 +02:00
Peter Ross
973a758f52 tls: cafile, cert, key options 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-22 19:12:15 +02:00
Nicolas George
9c1d649ce5 overlay: clear cur_buf on main input link. 
A reference is kept in the queue and freed after use.
 2012-07-22 18:35:28 +02:00
Anton Khirnov
df53a4a7c1 FATE: fix the asyncts test 
Nellymoser is float, so use oneoff comparison instead of md5.
 2012-07-22 17:58:56 +02:00
Peter Ross
1be55c82a5 av_url_split: dont let '/' char whallop '?' char 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-22 16:26:43 +02:00
Nicolas George
21fb7ff35b 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.
 2012-07-22 12:48:57 +02:00
Diego Biurrun
6bd37e0b28 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.
 2012-07-22 12:36:30 +02:00
Steven Robertson
82ecae8a70 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>
 2012-07-22 12:17:34 +02:00
Stefano Sabatini
8c2ce16f93 doc/filter_design: fix a few typos 2012-07-22 12:16:18 +02:00
Stefano Sabatini
c0b91348fe 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.
 2012-07-22 10:32:21 +02:00
Stefano Sabatini
9ce0e19ab6 lavd/caca: provide more meaningful feedback if fails to set a dither option 2012-07-22 10:32:15 +02:00
Stefano Sabatini
fa71471cef 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.
 2012-07-22 10:31:33 +02:00
Stefano Sabatini
d510527885 lavd/caca: sort arguments for -list_dither 2012-07-22 10:28:23 +02:00
Stefano Sabatini
295e0e4b4f lavd/caca: extend error message for -list_dither option 2012-07-22 10:28:23 +02:00
Stefano Sabatini
2fd880449a doc/outdevs: extend documentation for caca -list* options 2012-07-22 10:28:22 +02:00
Anton Khirnov
73cd131ebc FATE: add a test for the asyncts audio filter. 2012-07-22 10:14:16 +02:00
Steven Robertson
71311d697a 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.
 2012-07-22 09:59:25 +02:00
Anton Khirnov
721113bed2 matroskadec: return more correct error code on read error. 2012-07-22 09:14:05 +02:00
Anton Khirnov
a8a2271fe0 buffersrc: check ff_get_audio_buffer() for errors. 2012-07-22 09:14:05 +02:00
Anton Khirnov
8f3a3ce730 lavfi: check all ff_get_video_buffer() calls for errors. 2012-07-22 09:14:05 +02:00
Anton Khirnov
1dc4205018 lavfi: check all avfilter_ref_buffer() calls for errors. 2012-07-22 09:14:05 +02:00
Anton Khirnov
80e4ed279b vf_select: avoid an unnecessary avfilter_ref_buffer(). 2012-07-22 09:14:05 +02:00
Anton Khirnov
785fa50f0b buffersrc: avoid creating unnecessary buffer reference 2012-07-22 09:14:05 +02:00
Anton Khirnov
02ac7311c8 lavfi: use avfilter_unref_bufferp() where appropriate. 2012-07-22 09:14:05 +02:00
Anton Khirnov
043800a968 vf_fps: add more error checks. 2012-07-22 09:14:05 +02:00
Anton Khirnov
d515e9c225 vf_fps: fix a memleak on malloc failure. 2012-07-22 09:14:05 +02:00
Anton Khirnov
3825b52688 lavfi: check all ff_start_frame/draw_slice/end_frame calls for errors 2012-07-22 09:14:05 +02:00
Anton Khirnov
d4f89906e3 lavfi: add error handling to end_frame(). 2012-07-22 09:14:05 +02:00
Anton Khirnov
e9b992d035 lavfi: add error handling to draw_slice(). 2012-07-22 09:14:05 +02:00
Anton Khirnov
ebc8d97481 lavfi: add error handling to start_frame(). 2012-07-22 09:14:04 +02:00
Kostya Shishkov
1470ce21ce Bump libavcodec and libavformat minor versions for G.723.1 decoder and demuxer 2012-07-22 08:43:12 +02:00
Mohamed Naufal Basheer
55c3a4f617 G.723.1 demuxer and decoder 
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
 2012-07-22 07:58:54 +02:00
Mohamed Naufal Basheer
8aac5585fa 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>
 2012-07-22 07:58:53 +02:00
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