RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
45,197 Commits 36 Branches 398 Tags 244 MiB
Commit Graph

45197 Commits

Author SHA1 Message Date
Carl Eugen Hoyos 61a9f099b7 Write 32bit palette to Targa files. 
Current ImageMagick fails to read such files,
therefore only write the 32bit palette if the
palette actually contains any transparency
information.
 2012-10-09 10:13:14 +02:00
Michael Niedermayer 1e83e6ad7a ra144: fix code with ftrapv. 
A better solution is welcome!

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-09 06:02:34 +02:00
Michael Niedermayer 03f5043f5d eval: Fix eval test with ftrapv 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-09 06:02:34 +02:00
Michael Niedermayer e73bac484f configure: add support to nicely enable ftrapv 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-09 06:02:34 +02:00
Bobby Bingham b56f94cc36 targa: cosmetics - add some whitespace 
Signed-off-by: Bobby Bingham <uhmmmm@gmail.com>
 2012-10-08 22:49:23 -05:00
Bobby Bingham 50787fe350 targa: remove unused context members 
Signed-off-by: Bobby Bingham <uhmmmm@gmail.com>
 2012-10-08 22:47:58 -05:00
Bobby Bingham c2eec3df89 targa: support 2-way and 4-way interleaved files 
Fixes ticket #701

Signed-off-by: Bobby Bingham <uhmmmm@gmail.com>
 2012-10-08 22:47:57 -05:00
Bobby Bingham 3d9cdfdce7 targa: use named constants for flag values 
Signed-off-by: Bobby Bingham <uhmmmm@gmail.com>
 2012-10-08 22:47:57 -05:00
Michael Niedermayer d07940b76d motion_est: switch asserts to av_asserts 
note, the asserts where enabled by default before this

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-09 05:06:39 +02:00
Michael Niedermayer 72c2d8a346 dsputil: convert asserts to av_asserts 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-09 04:07:30 +02:00
Michael Niedermayer 8da7907a4a adpcmenc: switch to av_assert() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-09 04:00:55 +02:00
Carl Eugen Hoyos b49d94e4f2 Support decoding of targa files with 32bit palette. 2012-10-09 01:58:48 +02:00
Tim Nicholson a02762995b movenc.c: Force correct value for "Samples per packet" for pcm audio 
Apple spec is for it to always be "1" for uncompressed audio.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-09 00:01:09 +02:00
Michael Niedermayer 52dc18d414 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  x86: vc1: call ff_vc1dsp_init_x86() under if (ARCH_X86)
  x86: cavs: call ff_cavsdsp_init_x86() under if (ARCH_X86)
  x86: call most of the x86 dsp init functions under if (ARCH_X86)
  doc: support the new website layout
  doc: remove a warning from filters.texi
  doc: initial nut documentation
  segment: drop global headers setting
  lavu: fix typo in Makefile

Conflicts:
	doc/Makefile
	doc/filters.texi
	doc/t2h.init
	libavcodec/fmtconvert.c
	libavcodec/proresdsp.c
	libavcodec/x86/Makefile
	libavcodec/x86/vc1dsp_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-08 21:46:34 +02:00
Michael Niedermayer ac627b3d38 Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 
* commit '716d413c13981da15323c7a3821860536eefdbbb':
  Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormat

Conflicts:
	doc/examples/muxing.c
	ffmpeg.h
	ffmpeg_filter.c
	ffmpeg_opt.c
	ffplay.c
	ffprobe.c
	libavcodec/8bps.c
	libavcodec/aasc.c
	libavcodec/aura.c
	libavcodec/avcodec.h
	libavcodec/avs.c
	libavcodec/bfi.c
	libavcodec/bmp.c
	libavcodec/bmpenc.c
	libavcodec/c93.c
	libavcodec/cscd.c
	libavcodec/cyuv.c
	libavcodec/dpx.c
	libavcodec/dpxenc.c
	libavcodec/eatgv.c
	libavcodec/escape124.c
	libavcodec/ffv1.c
	libavcodec/flashsv.c
	libavcodec/fraps.c
	libavcodec/h264.c
	libavcodec/huffyuv.c
	libavcodec/iff.c
	libavcodec/imgconvert.c
	libavcodec/indeo3.c
	libavcodec/kmvc.c
	libavcodec/libopenjpegdec.c
	libavcodec/libopenjpegenc.c
	libavcodec/libx264.c
	libavcodec/ljpegenc.c
	libavcodec/mjpegdec.c
	libavcodec/mjpegenc.c
	libavcodec/motionpixels.c
	libavcodec/mpeg12.c
	libavcodec/mpeg12enc.c
	libavcodec/mpeg4videodec.c
	libavcodec/mpegvideo_enc.c
	libavcodec/pamenc.c
	libavcodec/pcxenc.c
	libavcodec/pgssubdec.c
	libavcodec/pngdec.c
	libavcodec/pngenc.c
	libavcodec/pnm.c
	libavcodec/pnmdec.c
	libavcodec/pnmenc.c
	libavcodec/ptx.c
	libavcodec/qdrw.c
	libavcodec/qpeg.c
	libavcodec/qtrleenc.c
	libavcodec/raw.c
	libavcodec/rawdec.c
	libavcodec/rl2.c
	libavcodec/sgidec.c
	libavcodec/sgienc.c
	libavcodec/snowdec.c
	libavcodec/snowenc.c
	libavcodec/sunrast.c
	libavcodec/targa.c
	libavcodec/targaenc.c
	libavcodec/tiff.c
	libavcodec/tiffenc.c
	libavcodec/tmv.c
	libavcodec/truemotion2.c
	libavcodec/utils.c
	libavcodec/vb.c
	libavcodec/vp3.c
	libavcodec/wnv1.c
	libavcodec/xl.c
	libavcodec/xwddec.c
	libavcodec/xwdenc.c
	libavcodec/yop.c
	libavdevice/v4l2.c
	libavdevice/x11grab.c
	libavfilter/avfilter.c
	libavfilter/avfilter.h
	libavfilter/buffersrc.c
	libavfilter/drawutils.c
	libavfilter/formats.c
	libavfilter/src_movie.c
	libavfilter/vf_ass.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_fade.c
	libavfilter/vf_format.c
	libavfilter/vf_hflip.c
	libavfilter/vf_lut.c
	libavfilter/vf_overlay.c
	libavfilter/vf_pad.c
	libavfilter/vf_scale.c
	libavfilter/vf_transpose.c
	libavfilter/vf_yadif.c
	libavfilter/video.c
	libavfilter/vsrc_testsrc.c
	libavformat/movenc.c
	libavformat/mxf.h
	libavformat/utils.c
	libavformat/yuv4mpeg.c
	libavutil/imgutils.c
	libavutil/pixdesc.c
	libswscale/input.c
	libswscale/output.c
	libswscale/swscale_internal.h
	libswscale/swscale_unscaled.c
	libswscale/utils.c
	libswscale/x86/swscale_template.c
	libswscale/x86/yuv2rgb.c
	libswscale/x86/yuv2rgb_template.c
	libswscale/yuv2rgb.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-08 21:06:57 +02:00
Anton Khirnov 89715a3cf1 lavu: fix typo in Makefile 2012-10-08 20:12:00 +02:00
Michael Niedermayer ae77266fce Merge commit '78071a1420b425dfb787ac739048f523007b8139' 
* commit '78071a1420b425dfb787ac739048f523007b8139':
  pixfmt: add AV_ prefixes to PIX_FMT_*

Conflicts:
	doc/APIchanges
	libavutil/pixfmt.h
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-08 19:42:49 +02:00
Michael Niedermayer 43c157f4a4 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  af_resample: avoid conversion of identical sample formats for 1 channel
  avcodec: allow either planar or interleaved sample format when encoding mono
  adpcmenc: ensure calls to adpcm_ima_compress_sample() are in the right order
  timefilter: De-doxygenize normal code comments and drop silly ones
  gxf: Include the right header for the avpriv_frame_rate_tab declaration

Conflicts:
	libavcodec/adpcmenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-08 13:11:11 +02:00
Janne Grunau 7e522859fc x86: vc1: call ff_vc1dsp_init_x86() under if (ARCH_X86) 2012-10-08 11:54:05 +02:00
Janne Grunau cb36febcbc x86: cavs: call ff_cavsdsp_init_x86() under if (ARCH_X86) 2012-10-08 11:54:05 +02:00
Janne Grunau f101eab1be x86: call most of the x86 dsp init functions under if (ARCH_X86) 
Rename the called dsp init functions to *_init_x86.
 2012-10-08 11:54:05 +02:00
Luca Barbato d19d01bf62 doc: support the new website layout 2012-10-08 11:22:42 +02:00
Luca Barbato 91f5f87561 doc: remove a warning from filters.texi 
The tag @table expects @item to mark entries.
 2012-10-08 11:22:42 +02:00
Luca Barbato 175d0d94da doc: initial nut documentation 2012-10-08 11:22:42 +02:00
Luca Barbato 0826d8513d segment: drop global headers setting 
avconv provides an option to set it externally and there isn't a way for
the outer demuxer to report the inner demuxer flag.

Solves a bad interaction between mpegts and x264, but requires
additional setting for the user.
 2012-10-08 11:22:42 +02:00
Paul B Mahol d7a4739265 TAK demuxer, decoder and parser 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-08 09:06:25 +00:00
Clément Bœsch 208a5d1322 fate/ffprobe: add some stream metadata. 2012-10-08 11:03:27 +02:00
Clément Bœsch f7c46d251c ffserver: fix seeking with ?date=... 
Regression since 5f847bf61d.

After this commit, timestamps pushed by FFmpeg won't be relative
anymore, but absolute (based on the date/time at the beginning of the
push). This will allow seeking to work properly. Before this patch, the
seek was done, but ffm timestamps were way smallers than the absolute
requested timestamp (based on a date), so the seek was done, but to the
end of the stream (which was similar to no effect at all).
 2012-10-08 09:03:19 +02:00
Anton Khirnov 8728b958ff lavu: fix typo in Makefile 2012-10-08 08:10:23 +02:00
Anton Khirnov 716d413c13 Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormat 2012-10-08 07:13:26 +02:00
Anton Khirnov 78071a1420 pixfmt: add AV_ prefixes to PIX_FMT_* 2012-10-08 07:12:16 +02:00
Pavel Koshevoy 9425dc3dba Fix build failure on osx 10.5.8 ppc 
Second parameter to vec_splat must be a literal, not a variable
value.  Therefore the second nested for-loop in
float_to_int16_stride_altivec had to be unrolled.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-08 05:40:26 +02:00
Michael Niedermayer f464b02d22 mpegts: fuzzy crc check for not so spec compliant files 
Fixes Ticket598

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-08 05:25:27 +02:00
Michael Niedermayer 43bbc3f477 xtea: give constants the correct type 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-08 03:44:18 +02:00
Michael Niedermayer 89074e9066 wmalosslessdec: remove unused variable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-08 03:12:44 +02:00
Michael Niedermayer b9a7719828 tscc: fix "assignment discards qualifiers from pointer target type" warning 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-08 03:11:02 +02:00
Michael Niedermayer c5fdd0696a tiff: fix "assignment discards qualifiers from pointer target type" warning 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-08 03:09:16 +02:00
Michael Niedermayer bd2613a322 rangecoder: fix "incompatible pointer type" warning 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-08 03:06:04 +02:00
Michael Niedermayer 106790a4e9 ffv1: fix array data types 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-08 02:11:25 +02:00
Michael Niedermayer fc6860a3eb 8svx: remove unused variable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-08 02:09:28 +02:00
Michael Niedermayer adcfc0535d mxfenc: fix av_log data type for dts paramater 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-08 02:08:28 +02:00
Michael Niedermayer f2a7e1a62b mux: change 1 assert->av_assert1() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-07 23:31:27 +02:00
Michael Niedermayer 2714e841bc x86/motion_est: assert->av_assert2() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-07 23:31:27 +02:00
Michael Niedermayer f9b0694cc8 motion-test: fix height parameter 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-07 23:31:27 +02:00
Justin Ruggles 7b556be673 af_resample: avoid conversion of identical sample formats for 1 channel 
When there is only 1 channel, the planar and interleaved formats of the same
data type should be treated as identical.
 2012-10-07 16:45:50 -04:00
Justin Ruggles 37f701f1c3 avcodec: allow either planar or interleaved sample format when encoding mono 
When there is only 1 channel, the planar and interleaved formats of the same
data type should be treated as identical.
 2012-10-07 16:45:50 -04:00
Justin Ruggles 5364327186 adpcmenc: ensure calls to adpcm_ima_compress_sample() are in the right order 
Should fix fate-acodec-adpcm-ima_wav with several compilers.
 2012-10-07 16:45:50 -04:00
Diego Biurrun 62ae37decd timefilter: De-doxygenize normal code comments and drop silly ones 2012-10-07 22:31:29 +02:00
Justin Ruggles d58b25aaa2 adpcmenc: ensure calls to adpcm_ima_compress_sample() are in the right order 
Should fix fate-acodec-adpcm-ima_wav with several compilers.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-07 22:29:42 +02:00
Paul B Mahol 27a341518e avformat: fix typo in comment 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-07 17:57:13 +00:00