You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
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>
|
13 years ago |
| .. |
|
libvo
|
…
|
|
|
cpudetect.h
|
…
|
|
|
help_mp.h
|
…
|
|
|
img_format.c
|
…
|
|
|
img_format.h
|
…
|
|
|
mp_image.c
|
…
|
|
|
mp_image.h
|
…
|
|
|
mp_msg.h
|
…
|
|
|
mpbswap.h
|
…
|
|
|
mpc_info.h
|
…
|
|
|
pullup.c
|
…
|
|
|
pullup.h
|
…
|
|
|
vd_ffmpeg.h
|
…
|
|
|
vf.h
|
…
|
|
|
vf_denoise3d.c
|
…
|
|
|
vf_detc.c
|
…
|
|
|
vf_dint.c
|
…
|
|
|
vf_divtc.c
|
…
|
|
|
vf_down3dright.c
|
…
|
|
|
vf_dsize.c
|
…
|
|
|
vf_eq.c
|
…
|
|
|
vf_eq2.c
|
…
|
|
|
vf_field.c
|
…
|
|
|
vf_fil.c
|
…
|
|
|
vf_filmdint.c
|
…
|
|
|
vf_fixpts.c
|
…
|
|
|
vf_fspp.c
|
…
|
|
|
vf_geq.c
|
…
|
|
|
vf_harddup.c
|
…
|
|
|
vf_hqdn3d.c
|
…
|
|
|
vf_il.c
|
…
|
|
|
vf_ilpack.c
|
…
|
|
|
vf_ivtc.c
|
…
|
|
|
vf_kerndeint.c
|
…
|
|
|
vf_mcdeint.c
|
…
|
|
|
vf_noise.c
|
…
|
|
|
vf_ow.c
|
…
|
|
|
vf_palette.c
|
…
|
|
|
vf_perspective.c
|
…
|
|
|
vf_phase.c
|
…
|
|
|
vf_pp.c
|
…
|
|
|
vf_pp7.c
|
…
|
|
|
vf_pullup.c
|
…
|
|
|
vf_qp.c
|
…
|
|
|
vf_rectangle.c
|
…
|
|
|
vf_sab.c
|
…
|
|
|
vf_scale.h
|
…
|
|
|
vf_softpulldown.c
|
…
|
|
|
vf_softskip.c
|
…
|
|
|
vf_spp.c
|
…
|
|
|
vf_stereo3d.c
|
…
|
|
|
vf_telecine.c
|
…
|
|
|
vf_tile.c
|
…
|
|
|
vf_tinterlace.c
|
…
|
|
|
vf_unsharp.c
|
…
|
|
|
vf_uspp.c
|
…
|
|
|
vf_yuvcsp.c
|
…
|
|
|
vf_yvu9.c
|
…
|
|
|
vfcap.h
|
…
|
|
