Stowage/ffmpeg
2
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-02-09 19:30:19 +00:00
Code Issues Projects Releases Packages Wiki Activity
ffmpeg/libavfilter/libmpcodecs
History
Michael Niedermayer 7a72695c05 Merge commit '36ef5369ee' 
* commit '36ef5369ee':
  Replace all CODEC_ID_* with AV_CODEC_ID_*
  lavc: add AV prefix to codec ids.

Conflicts:
	doc/APIchanges
	doc/examples/decoding_encoding.c
	doc/examples/muxing.c
	ffmpeg.c
	ffprobe.c
	ffserver.c
	libavcodec/8svx.c
	libavcodec/avcodec.h
	libavcodec/dnxhd_parser.c
	libavcodec/dvdsubdec.c
	libavcodec/error_resilience.c
	libavcodec/h263dec.c
	libavcodec/libvorbisenc.c
	libavcodec/mjpeg_parser.c
	libavcodec/mjpegenc.c
	libavcodec/mpeg12.c
	libavcodec/mpeg4videodec.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/pcm.c
	libavcodec/r210dec.c
	libavcodec/utils.c
	libavcodec/v210dec.c
	libavcodec/version.h
	libavdevice/alsa-audio-dec.c
	libavdevice/bktr.c
	libavdevice/v4l2.c
	libavformat/asfdec.c
	libavformat/asfenc.c
	libavformat/avformat.h
	libavformat/avidec.c
	libavformat/caf.c
	libavformat/electronicarts.c
	libavformat/flacdec.c
	libavformat/flvdec.c
	libavformat/flvenc.c
	libavformat/framecrcenc.c
	libavformat/img2.c
	libavformat/img2dec.c
	libavformat/img2enc.c
	libavformat/ipmovie.c
	libavformat/isom.c
	libavformat/matroska.c
	libavformat/matroskadec.c
	libavformat/matroskaenc.c
	libavformat/mov.c
	libavformat/movenc.c
	libavformat/mp3dec.c
	libavformat/mpeg.c
	libavformat/mpegts.c
	libavformat/mxf.c
	libavformat/mxfdec.c
	libavformat/mxfenc.c
	libavformat/nsvdec.c
	libavformat/nut.c
	libavformat/oggenc.c
	libavformat/pmpdec.c
	libavformat/rawdec.c
	libavformat/rawenc.c
	libavformat/riff.c
	libavformat/sdp.c
	libavformat/utils.c
	libavformat/vocenc.c
	libavformat/wtv.c
	libavformat/xmv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-07 22:45:46 +02:00
..
libvo Update to latest MPlayer version. 2011-03-25 19:05:02 +01:00
cpudetect.h Add MPlayers libmpcodecs, this will be needed for our libavfilter wraper for it. 2011-01-20 00:49:27 +01:00
help_mp.h Add MPlayers libmpcodecs, this will be needed for our libavfilter wraper for it. 2011-01-20 00:49:27 +01:00
img_format.c Add MPlayers libmpcodecs, this will be needed for our libavfilter wraper for it. 2011-01-20 00:49:27 +01:00
img_format.h Add MPlayers libmpcodecs, this will be needed for our libavfilter wraper for it. 2011-01-20 00:49:27 +01:00
mp_image.c Hack libmpcodecs to make it buildable. 2011-01-20 00:59:30 +01:00
mp_image.h Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
mp_msg.h Add MPlayers libmpcodecs, this will be needed for our libavfilter wraper for it. 2011-01-20 00:49:27 +01:00
mpbswap.h remove definition of swab 2011-03-17 19:09:45 +01:00
mpc_info.h Add MPlayers libmpcodecs, this will be needed for our libavfilter wraper for it. 2011-01-20 00:49:27 +01:00
pullup.c Add MPlayers libmpcodecs, this will be needed for our libavfilter wraper for it. 2011-01-20 00:49:27 +01:00
pullup.h Add MPlayers libmpcodecs, this will be needed for our libavfilter wraper for it. 2011-01-20 00:49:27 +01:00
vd_ffmpeg.h Add MPlayers libmpcodecs, this will be needed for our libavfilter wraper for it. 2011-01-20 00:49:27 +01:00
vf.h Hack libmpcodecs to make it buildable. 2011-01-20 00:59:30 +01:00
vf_decimate.c Add MPlayers libmpcodecs, this will be needed for our libavfilter wraper for it. 2011-01-20 00:49:27 +01:00
vf_denoise3d.c Add MPlayers libmpcodecs, this will be needed for our libavfilter wraper for it. 2011-01-20 00:49:27 +01:00
vf_detc.c Port libmpcodec fixes from MPlayer. 2011-05-31 07:40:20 +02:00
vf_dint.c Port libmpcodec fixes from MPlayer. 2011-05-31 07:40:20 +02:00
vf_divtc.c Port recent changes to MPlayer libmpcodecs. 2011-06-02 08:38:09 +02:00
vf_down3dright.c Add MPlayers libmpcodecs, this will be needed for our libavfilter wraper for it. 2011-01-20 00:49:27 +01:00
vf_dsize.c Add MPlayers libmpcodecs, this will be needed for our libavfilter wraper for it. 2011-01-20 00:49:27 +01:00
vf_eq.c Remove dependancy of m_option & m_struct from libmpcodecs. 2011-01-20 00:57:33 +01:00
vf_eq2.c Add MPlayers libmpcodecs, this will be needed for our libavfilter wraper for it. 2011-01-20 00:49:27 +01:00
vf_field.c Add MPlayers libmpcodecs, this will be needed for our libavfilter wraper for it. 2011-01-20 00:49:27 +01:00
vf_fil.c Add MPlayers libmpcodecs, this will be needed for our libavfilter wraper for it. 2011-01-20 00:49:27 +01:00
vf_filmdint.c Add MPlayers libmpcodecs, this will be needed for our libavfilter wraper for it. 2011-01-20 00:49:27 +01:00
vf_fixpts.c Add MPlayers libmpcodecs, this will be needed for our libavfilter wraper for it. 2011-01-20 00:49:27 +01:00
vf_framestep.c Fix "ouput" typo and add a check. 2012-01-28 11:04:19 +01:00
vf_fspp.c vf_fspp: add ff_ prefix to non static variables. 2012-03-14 23:06:00 +01:00
vf_geq.c libmpcodecs: some hunks from mplayer HEAD 2011-09-20 05:14:52 +02:00
vf_harddup.c Add MPlayers libmpcodecs, this will be needed for our libavfilter wraper for it. 2011-01-20 00:49:27 +01:00
vf_hqdn3d.c Add MPlayers libmpcodecs, this will be needed for our libavfilter wraper for it. 2011-01-20 00:49:27 +01:00
vf_hue.c Remove dependancy of m_option & m_struct from libmpcodecs. 2011-01-20 00:57:33 +01:00
vf_il.c Add MPlayers libmpcodecs, this will be needed for our libavfilter wraper for it. 2011-01-20 00:49:27 +01:00
vf_ilpack.c Port recent changes to MPlayer libmpcodecs. 2011-06-02 08:38:09 +02:00
vf_ivtc.c Add MPlayers libmpcodecs, this will be needed for our libavfilter wraper for it. 2011-01-20 00:49:27 +01:00
vf_kerndeint.c Add MPlayers libmpcodecs, this will be needed for our libavfilter wraper for it. 2011-01-20 00:49:27 +01:00
vf_mcdeint.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
vf_noise.c Add MPlayers libmpcodecs, this will be needed for our libavfilter wraper for it. 2011-01-20 00:49:27 +01:00
vf_ow.c Add MPlayers libmpcodecs, this will be needed for our libavfilter wraper for it. 2011-01-20 00:49:27 +01:00
vf_palette.c Replace all strcasecmp/strncasecmp usages. 2011-11-03 19:25:26 +01:00
vf_perspective.c libmpcodecs: some hunks from mplayer HEAD 2011-09-20 05:14:52 +02:00
vf_phase.c Add MPlayers libmpcodecs, this will be needed for our libavfilter wraper for it. 2011-01-20 00:49:27 +01:00
vf_pp.c vf_pp: dont pass NULL into pp, it would fail 2012-07-07 19:14:51 +02:00
vf_pp7.c libmpcodecs: some hunks from mplayer HEAD 2011-09-20 05:14:52 +02:00
vf_pullup.c Avoid dependancy on global variable verbose in libmpcodecs/vf_pullup.c 2011-01-20 00:52:26 +01:00
vf_qp.c mp: remove use of deprecated old eval API 2011-04-21 18:45:56 +02:00
vf_rectangle.c Add MPlayers libmpcodecs, this will be needed for our libavfilter wraper for it. 2011-01-20 00:49:27 +01:00
vf_rotate.c Add MPlayers libmpcodecs, this will be needed for our libavfilter wraper for it. 2011-01-20 00:49:27 +01:00
vf_sab.c libmpcodecs: some hunks from mplayer HEAD 2011-09-20 05:14:52 +02:00
vf_scale.h Port remove of get_sws_cpuflags from MPlayer's libmpcodecs. 2011-06-02 08:38:09 +02:00
vf_smartblur.c libmpcodecs: some hunks from mplayer HEAD 2011-09-20 05:14:52 +02:00
vf_softpulldown.c Add MPlayers libmpcodecs, this will be needed for our libavfilter wraper for it. 2011-01-20 00:49:27 +01:00
vf_softskip.c Add MPlayers libmpcodecs, this will be needed for our libavfilter wraper for it. 2011-01-20 00:49:27 +01:00
vf_spp.c Add MPlayers libmpcodecs, this will be needed for our libavfilter wraper for it. 2011-01-20 00:49:27 +01:00
vf_stereo3d.c libavfilter/libmpcodecs: add vf_stereo3d support 2011-09-20 05:49:42 +02:00
vf_telecine.c Add MPlayers libmpcodecs, this will be needed for our libavfilter wraper for it. 2011-01-20 00:49:27 +01:00
vf_tile.c Add MPlayers libmpcodecs, this will be needed for our libavfilter wraper for it. 2011-01-20 00:49:27 +01:00
vf_tinterlace.c Add MPlayers libmpcodecs, this will be needed for our libavfilter wraper for it. 2011-01-20 00:49:27 +01:00
vf_unsharp.c Port recent changes to MPlayer libmpcodecs. 2011-06-02 08:38:09 +02:00
vf_uspp.c Merge commit '36ef5369ee' 2012-08-07 22:45:46 +02:00
vf_yuvcsp.c Add MPlayers libmpcodecs, this will be needed for our libavfilter wraper for it. 2011-01-20 00:49:27 +01:00
vf_yvu9.c Add MPlayers libmpcodecs, this will be needed for our libavfilter wraper for it. 2011-01-20 00:49:27 +01:00
vfcap.h Add MPlayers libmpcodecs, this will be needed for our libavfilter wraper for it. 2011-01-20 00:49:27 +01:00