virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
52dc18d414
FFmpeg/libavutil
History
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
..
arm Merge remote-tracking branch 'qatar/master' 2012-10-03 13:35:02 +02:00
avr32
bfin
mips
ppc ppc/cpu: make linux 32bit specific altivec detection depend on __linux__ 2012-09-24 13:41:48 +02:00
sh4
tomi
x86 Merge remote-tracking branch 'qatar/master' 2012-10-05 17:04:15 +02:00
adler32.c
adler32.h
aes.c
aes.h
attributes.h
audio_fifo.c Don't include common.h from avutil.h 2012-08-15 22:32:06 +03:00
audio_fifo.h
audioconvert.c Merge remote-tracking branch 'qatar/master' 2012-09-13 15:35:50 +02:00
audioconvert.h Merge remote-tracking branch 'qatar/master' 2012-09-13 15:35:50 +02:00
avassert.h
avstring.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
avstring.h
avutil.h avutil: Cast AV_NOPTS_VALUE to int64_t explicitly 2012-09-19 19:49:24 +02:00
base64.c
base64.h
blowfish.c Merge commit '29abb04e73b0580ebe38703cadb988d26df6a76a' 2012-10-04 12:30:25 +02:00
blowfish.h
bprint.c bprint: Remove custom vsnprintf 2012-09-15 19:47:10 -04:00
bprint.h lavu/bprint: readd documentation for 0 and 1 av_bprint_init() special values 2012-07-31 13:15:43 +02:00
bswap.h
colorspace.h
common.h Merge remote-tracking branch 'qatar/master' 2012-08-13 14:38:43 +02:00
cpu.c Merge commit 'd58dd4b5b5d31cfd4092e38a5f2c894eee2ab078' 2012-09-05 14:09:09 +02:00
cpu.h cpu: improve av_get_cpu_flags() doxy 2012-10-01 16:41:37 +02:00
crc_data.h
crc.c
crc.h
des.c av_des_init: suppress warning about unused parameter 2012-09-19 21:57:58 +02:00
des.h
dict.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
dict.h Merge remote-tracking branch 'qatar/master' 2012-10-06 13:45:08 +02:00
error.c lavu/error: make error_entries static const. 2012-09-16 02:53:32 +02:00
error.h Don't include common.h from avutil.h 2012-08-15 22:32:06 +03:00
eval.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
eval.h
fifo.c
fifo.h Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
file.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
file.h Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
float_dsp.c
float_dsp.h
imgutils.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
imgutils.h Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
integer.c integer: switch to av_assert 2012-08-09 01:44:15 +02:00
integer.h
internal.h Merge commit '29abb04e73b0580ebe38703cadb988d26df6a76a' 2012-10-04 12:30:25 +02:00
intfloat_readwrite.c
intfloat_readwrite.h
intfloat.h
intmath.h x86: remove FASTDIV inline asm 2012-08-22 14:29:10 +01:00
intreadwrite.h intreadwrite: Dont evaluate value for AV_W* multiple times. 2012-09-04 21:45:13 +02:00
inverse.c
lfg.c avformat: Remove non-compiling and/or silly commented-out printf/av_log statements 2012-10-01 10:24:28 +02:00
lfg.h Merge remote-tracking branch 'qatar/master' 2012-10-06 13:45:08 +02:00
libavutil.v
libm.h
lls.c
lls.h
log.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
log.h
lzo.c
lzo.h
Makefile lavu: fix typo in Makefile 2012-10-08 20:12:00 +02:00
mathematics.c
mathematics.h
md5.c
md5.h
mem.c
mem.h mem: fix typo in check for __ICC 2012-09-10 00:07:26 +01:00
old_pix_fmts.h Merge commit '78071a1420b425dfb787ac739048f523007b8139' 2012-10-08 19:42:49 +02:00
opt.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
opt.h lavu/opt: cosmetic fixes forgotten in the previous patch. 2012-09-30 10:23:08 +02:00
parseutils.c Merge remote-tracking branch 'qatar/master' 2012-10-07 11:28:38 +02:00
parseutils.h lavu/parseutils: add av_small_strptime() 2012-09-06 00:40:01 +02:00
pca.c pca: get rid of VLA 2012-10-06 14:03:15 +02:00
pca.h
pixdesc.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
pixdesc.h Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
pixfmt.h Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
qsort.h
random_seed.c random_seed: Replace a VLA with a normal array 2012-09-08 17:30:10 +02:00
random_seed.h
rational.c
rational.h Merge remote-tracking branch 'qatar/master' 2012-08-05 22:17:02 +02:00
rc4.c
rc4.h
samplefmt.c Merge commit 'ab35ec29a4071871934856c00da7d6ebcc0c095b' 2012-10-04 13:11:45 +02:00
samplefmt.h Merge commit 'ab35ec29a4071871934856c00da7d6ebcc0c095b' 2012-10-04 13:11:45 +02:00
sha.c
sha.h
softfloat.c
softfloat.h
time.c
time.h
timecode.c lavu/timecode: add av_timecode_check_frame_rate(). 2012-08-08 09:11:26 +02:00
timecode.h lavu/timecode: add av_timecode_check_frame_rate(). 2012-08-08 09:11:26 +02:00
timer.h Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
timestamp.h
tree.c Merge remote-tracking branch 'qatar/master' 2012-08-16 16:20:30 +02:00
tree.h
utils.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
version.h Merge commit '78071a1420b425dfb787ac739048f523007b8139' 2012-10-08 19:42:49 +02:00
x86_cpu.h x86_cpu.h: newline at the end to shutup some warnings in opencc 2012-09-13 19:31:02 +02:00
xga_font_data.c Move xGA font data from lavc to lavu. 2012-10-01 22:24:17 +02:00
xga_font_data.h Move xGA font data from lavc to lavu. 2012-10-01 22:24:17 +02:00
xtea.c xtea: give constants the correct type 2012-10-08 03:44:18 +02:00
xtea.h Merge remote-tracking branch 'qatar/master' 2012-08-10 16:25:23 +02:00