[SCM] FFmpeg packaging branch, ubuntu.jaunty.unstripped, updated. debian/0.svn20090303-1-48-gc064087
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Fri Mar 13 10:23:16 UTC 2009
The following commit has been merged in the ubuntu.jaunty.unstripped branch:
commit c3d1e5152119d4635e086e7af597695003b0509c
Merge: eb1e1bf1884686329edb921a6c6bb75c60b16c51 605983f3f1ba8a21a0c7c51700427db46cc662cd
Author: Reinhard Tartler <siretart at tauware.de>
Date: Fri Mar 13 09:17:41 2009 +0100
merge from ubuntu.jaunty branch
diff --combined debian/changelog
index b443eb3,f835b22..ddd56dc
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,51 +1,69 @@@
+ ffmpeg-debian (3:0.svn20090303-1ubuntu1) jaunty; urgency=low
+
+ * FFE granted in LP: #340303.
+
+ * merge from debian/unstable.
+ * remaining changes to debian:
+ - don't build-depend on libfaad-dev, disabling faad decoder.
+
+ -- Reinhard Tartler <siretart at tauware.de> Fri, 13 Mar 2009 08:54:33 +0100
+
+ ffmpeg-debian (3:0.svn20090303-1) unstable; urgency=low
+
+ * New Upstream Version (svn revision 17737 libswscale revision 28799)
+ - Electronic Arts TQI decoder
+ - OpenJPEG based JPEG 2000 decoder
+ - NC (NC4600) camera file demuxer
+ - Gopher client support
+ - MXF D-10 muxer
+ - generic metadata API
+ * debian/get-orig-source.sh: Track the version 0.5 release branch. The
+ version number does not really reflect this, but this package is
+ actually very close to the 0.5 release branch.
+ * various cleanups to improve get-orig-source.sh
+ * Remove liba52 from the suggests field in debian/control.ffmpeg, as
+ ffmpeg does no longer use it since upload 0.svn20080206-10.
+ * Fix the Vcs-Git urls to the correct locations.
+ * The libavformat52 now links against libavcodec52, which breaks
+ applications that *ALSO* link against libavcodec51. Adding a
+ Breaks: libavcodec51 should prevent this and (hopefully) Closes: #516885.
+ * improve parallel builds on SMP/multicores by supporting the parallel
+ flag in DEB_BUILD_OPTIONS, and default to the number of available CPUs
+ on i386 and amd64.
+ * Drop unapplied patches from debian/patches.
+ * bump shlibs version.
+
+ -- Reinhard Tartler <siretart at tauware.de> Tue, 03 Mar 2009 21:01:25 +0100
+
+ ffmpeg-debian (3:0.svn20090204-3) unstable; urgency=low
+
+ [ Fabian Greffrath ]
+ * remove libasound2-dev from build-depends on non-Linux archs
+
+ [ Reinhard Tartler ]
+ * fix postinst generation by calling dh_installdeb after dh_makeshlibs
+ * upload to unstable
+
+ -- Reinhard Tartler <siretart at tauware.de> Sun, 22 Feb 2009 09:32:49 +0100
+
+ffmpeg (3:0.svn20090204-2ubuntu1+unstripped3) jaunty; urgency=low
+
+ * add conflicts replaces for libavfilter0, LP: #322570
+
+ -- Reinhard Tartler <siretart at tauware.de> Mon, 09 Mar 2009 18:24:56 +0100
+
+ffmpeg (3:0.svn20090204-2ubuntu1+unstripped2) jaunty; urgency=low
+
+ * add correct epoch in the "internal" shlibs generation
+
+ -- Reinhard Tartler <siretart at tauware.de> Fri, 06 Feb 2009 15:24:58 +0100
+
+ffmpeg (3:0.svn20090204-2ubuntu1+unstripped1) jaunty; urgency=low
+
+ * rebuild using a clean, uncrippled ffmpeg tarball
+
+ -- Reinhard Tartler <siretart at tauware.de> Thu, 05 Feb 2009 21:45:05 +0100
+
ffmpeg-debian (3:0.svn20090204-2ubuntu1) jaunty; urgency=low
* merge from debian. Remaining changes:
@@@ -73,21 -103,6 +121,21 @@@ ffmpeg-debian (3:0.svn20090204-1) exper
-- Reinhard Tartler <siretart at tauware.de> Sun, 01 Feb 2009 19:54:27 +0100
+ffmpeg (3:0.svn20090119-1ubuntu1+unstripped2) jaunty; urgency=low
+
+ * add conflicts/replaces on libavfilter0. LP: #323789
+
+ -- Reinhard Tartler <siretart at tauware.de> Sun, 01 Feb 2009 18:45:46 +0100
+
+ffmpeg (3:0.svn20090119-1ubuntu1+unstripped1) jaunty; urgency=low
+
+ * merge with the ubuntu.jaunty branch
+ * reenable x264 LP: #303537
+ * build against vdpau
+ * enable xvmc support
+
+ -- Reinhard Tartler <siretart at tauware.de> Tue, 20 Jan 2009 17:51:19 +0100
+
ffmpeg-debian (3:0.svn20090119-1ubuntu1) jaunty; urgency=low
* merge from debian. LP: #318501
@@@ -125,16 -140,6 +173,16 @@@ ffmpeg-debian (3:0.svn20090110-1) exper
-- Reinhard Tartler <siretart at tauware.de> Sun, 11 Jan 2009 20:55:48 +0100
+ffmpeg (3:0.svn20081115-1ubuntu1+unstripped1) jaunty; urgency=low
+
+ * build unstripped version for multiverse.
+ * enable additional external libraries:
+ - libmp3lame-dev
+ - libfaac-dev
+ - libxvidcore-dev
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 15 Nov 2008 19:50:42 +0100
+
ffmpeg-debian (3:0.svn20081115-1ubuntu1) jaunty; urgency=low
* merge from debian.
@@@ -143,7 -148,7 +191,7 @@@
source packages come from the same packaging branch.
* drop dependency on faad.
- -- Reinhard Tartler <siretart at tauware.de> Sat, 15 Nov 2008 19:44:29 +0100
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 15 Nov 2008 19:50:19 +0100
ffmpeg-debian (3:0.svn20081115-1) experimental; urgency=low
diff --combined debian/control
index 4ab9378,50d16c9..3af1d68
--- a/debian/control
+++ b/debian/control
@@@ -1,4 -1,4 +1,4 @@@
- Source: ffmpeg
+ Source: ffmpeg-debian
Section: libs
Priority: optional
Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
@@@ -7,14 -7,13 +7,13 @@@ Uploaders: Sam Hocevar (Debian packages
Reinhard Tartler <siretart at tauware.de>,
Fabian Greffrath <fabian at debian-unofficial.org>
Standards-Version: 3.8.0
-Vcs-Git: git://git.debian.org/git/pkg-multimedia/ffmpeg-debian.git
-Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/ffmpeg-debian.git;a=summary
-Homepage: http://ffmpeg.org/
+Vcs-Git: git://git.debian.org/git/pkg-multimedia/ffmpeg.git
+Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/ffmpeg.git;a=summary
+Homepage: http://ffmpeg.mplayerhq.hu/
Build-Depends-Indep: doxygen
Build-Depends: debhelper (>= 5.0.0),
- libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libasound2-dev,
libdc1394-22-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- libfaad-dev | libfaad2-dev,
libfreetype6-dev,
libgsm1-dev,
libimlib2-dev,
@@@ -26,108 -25,213 +25,212 @@@
libvorbis-dev,
libx11-dev,
libxext-dev,
- libmp3lame-dev,
- libfaac-dev,
- libxvidcore-dev | libxvidcore4-dev,
+ libxvmc-dev,
quilt,
texi2html,
- libx264-dev (>> 1:0.svn20081230),
- libxvmc-dev [i386 amd64],
- nvidia-180-libvdpau-dev [i386 amd64],
zlib1g-dev
- Package: libavutil-unstripped-49
+ Package: ffmpeg
+ Section: graphics
+ Architecture: any
+ Depends: ${shlibs:Depends},
+ ${misc:Depends}
+ Description: multimedia player, server and encoder
+ This package contains the ffplay multimedia player, the ffserver streaming
+ server and the ffmpeg audio and video encoder. They support most existing
+ file formats (AVI, MPEG, OGG, Matroska, ASF...) and encoding formats (MPEG,
+ DivX, MPEG4, AC3, DV...).
+
+ Package: ffmpeg-dbg
+ Section: libs
+ Priority: extra
+ Architecture: any
+ Depends: libavutil49 (= ${binary:Version}),
+ libavcodec52 (= ${binary:Version}),
+ libavdevice52 (= ${binary:Version}),
+ libpostproc51 (= ${binary:Version}),
+ libavformat52 (= ${binary:Version}),
+ libswscale0 (= ${binary:Version}),
+ ffmpeg (= ${binary:Version})
+ Description: Debug symbols for ffmpeg related packages
+ This package contains debug data of the ffmpeg related shared libraries.
+ .
+ Most people will not need this package. Please install it to produce useful
+ stacktraces to help debugging the ffmpeg library.
+
+ Package: ffmpeg-doc
+ Section: doc
+ Architecture: all
+ Depends: ${misc:Depends}
+ Description: documentation of the ffmpeg API
+ This package contains the html doxygen documentation of the ffmpeg API.
+
+ Package: libavutil49
Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
- Conflicts: libavutilcvs49, libavutil49
- Replaces: libavutilcvs49, libavutil49
Description: ffmpeg utility library
This is the common utility library from the ffmpeg project. It is required
by all other ffmpeg libraries.
.
- This package contains a unrestricted version of the libavutil shared
+ This package contains a Debian-specific version of the libavutil shared
object that should only be used by Debian packages.
- Package: libavcodec-unstripped-52
+ Package: libavcodec52
Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
- Suggests: liba52-0.7.4, libfaad0
- Conflicts: libavcodec52
- Replaces: libavcodec52
Description: ffmpeg codec library
This is the codec library from the ffmpeg project. It supports most existing
encoding formats (MPEG, DivX, MPEG4, AC3, DV...).
.
- This package contains a unrestricted version of the libavcodec shared
+ This package contains a Debian-specific version of the libavcodec shared
object that should only be used by Debian packages.
- Package: libavdevice-unstripped-52
+ Package: libavdevice52
Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
Description: ffmpeg device handling library
This is the device handling library from the ffmpeg project.
.
- This package contains a unrestricted version of the libavdevice shared
+ This package contains a Debian-specific version of the libavdevice shared
object that should only be used by Debian packages.
- Package: libavfilter-unstripped-0
+ Package: libavformat52
Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
- Conflicts: libavfilter0
- Replaces: libavfilter0
- Description: ffmpeg video filtering library
- This is the video filtering library from the ffmpeg project.
-Breaks: libavcodec51
+ Description: ffmpeg file format library
+ This is the demuxer library from the ffmpeg project. It supports most
+ existing file formats (AVI, MPEG, OGG, Matroska, ASF...).
.
- This package contains a unrestricted version of the libavfilter shared
+ This package contains a Debian-specific version of the libavformat shared
object that should only be used by Debian packages.
- Package: libpostproc-unstripped-51
+ Package: libavfilter0
Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
- Conflicts: libpostproccvs51, libpostproc51
- Replaces: libpostproccvs51, libpostproc51
- Description: ffmpeg video postprocessing library
- This is the video postprocessing library from the ffmpeg project.
+ Description: ffmpeg video filtering library
+ This is the video filtering library from the ffmpeg project.
.
- This package contains a unrestricted version of the libpostproc shared
+ This package contains a Debian-specific version of the libavfilter shared
object that should only be used by Debian packages.
- Package: libavformat-unstripped-52
+ Package: libpostproc51
Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
- Conflicts: libavformatcvs52, libavformat52
- Replaces: libavformatcvs52, libavformat52
- Description: ffmpeg file format library
- This is the demuxer library from the ffmpeg project. It supports most
- existing file formats (AVI, MPEG, OGG, Matroska, ASF...).
+ Description: ffmpeg video postprocessing library
+ This is the video postprocessing library from the ffmpeg project.
.
- This package contains a unrestricted version of the libavformat shared
+ This package contains a Debian-specific version of the libpostproc shared
object that should only be used by Debian packages.
- Package: libswscale-unstripped-0
+ Package: libswscale0
Section: libs
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
Description: ffmpeg video scaling library
This is the video scaling library from the ffmpeg project.
.
- This package contains a unrestricted version of the libswscale shared
+ This package contains a Debian-specific version of the libswscale shared
object that should only be used by Debian packages.
+ Package: libavutil-dev
+ Section: libdevel
+ Architecture: any
+ Depends: libavutil49 (= ${binary:Version})
+ Description: development files for libavutil
+ This is the common utility library from the ffmpeg project. It is required
+ by all other ffmpeg libraries.
+ .
+ This package contains the header files and static libraries needed to
+ compile applications or shared objects that use libavutil.
+
+ Package: libavcodec-dev
+ Section: libdevel
+ Architecture: any
+ Depends: libavcodec52 (= ${binary:Version}),
+ libavutil-dev (= ${binary:Version})
+ Suggests: libfaad-dev,
+ libgsm1-dev,
+ libogg-dev,
+ libschroedinger-dev,
+ libspeex-dev,
+ libtheora-dev (>> 0.0.0.alpha4),
+ libvorbis-dev,
+ libx11-dev,
+ libxext-dev,
+ zlib1g-dev,
+ ${lib1394-dev}
+ Description: development files for libavcodec
+ This is the codec library from the ffmpeg project. It supports most existing
+ encoding formats (MPEG, DivX, MPEG4, AC3, DV...).
+ .
+ This package contains the header files and static libraries needed to
+ compile applications or shared objects that use libavcodec.
+
+ Package: libavdevice-dev
+ Section: libdevel
+ Architecture: any
+ Depends: libavdevice52 (= ${binary:Version}),
+ libavformat-dev (= ${binary:Version})
+ Description: development files for libavdevice
+ This is the device handling library from the ffmpeg project.
+ .
+ This package contains the header files and static libraries needed to
+ compile applications or shared objects that use libavdevice.
+
+ Package: libavformat-dev
+ Section: libdevel
+ Architecture: any
+ Depends: libavformat52 (= ${binary:Version}),
+ libavcodec-dev (= ${binary:Version})
+ Description: development files for libavformat
+ This is the demuxer library from the ffmpeg project. It supports most
+ existing file formats (AVI, MPEG, OGG, Matroska, ASF...).
+ .
+ This package contains the header files and static libraries needed to
+ compile applications or shared objects that use libavformat.
+
+ Package: libavfilter-dev
+ Section: libdevel
+ Architecture: any
+ Depends: libavfilter0 (= ${binary:Version}),
+ libavcodec-dev (= ${binary:Version})
+ Description: development files for libavfilter
+ This is the video filtering library from the ffmpeg project.
+ .
+ This package contains the header files and static libraries needed to
+ compile applications or shared objects that use libavfilter.
+
+ Package: libpostproc-dev
+ Section: libdevel
+ Architecture: any
+ Depends: libpostproc51 (= ${binary:Version}),
+ libavutil-dev (= ${binary:Version})
+ Description: development files for libpostproc
+ This is the video postprocessing library from the ffmpeg project.
+ .
+ This package contains the header files and static libraries needed to
+ compile applications or shared objects that use libpostproc.
+
+ Package: libswscale-dev
+ Section: libdevel
+ Architecture: any
+ Depends: libswscale0 (= ${binary:Version}),
+ libavutil-dev (= ${binary:Version})
+ Description: development files for libswscale
+ This is the video scaling library from the ffmpeg project.
+ .
+ This package contains the header files and static libraries needed to
+ compile applications or shared objects that use libswscale.
diff --combined libavcodec/allcodecs.c
index 55f7f3b,87d2f28..0cb0e6d
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@@ -28,10 -28,10 +28,10 @@@
#define REGISTER_ENCODER(X,x) { \
extern AVCodec x##_encoder; \
- if(CONFIG_##X##_ENCODER) register_avcodec(&x##_encoder); }
+ if(CONFIG_##X##_ENCODER) avcodec_register(&x##_encoder); }
#define REGISTER_DECODER(X,x) { \
extern AVCodec x##_decoder; \
- if(CONFIG_##X##_DECODER) register_avcodec(&x##_decoder); }
+ if(CONFIG_##X##_DECODER) avcodec_register(&x##_decoder); }
#define REGISTER_ENCDEC(X,x) REGISTER_ENCODER(X,x); REGISTER_DECODER(X,x)
#define REGISTER_PARSER(X,x) { \
@@@ -71,6 -71,7 +71,7 @@@ void avcodec_register_all(void
REGISTER_DECODER (EACMV, eacmv);
REGISTER_DECODER (EATGQ, eatgq);
REGISTER_DECODER (EATGV, eatgv);
+ REGISTER_DECODER (EATQI, eatqi);
REGISTER_DECODER (EIGHTBPS, eightbps);
REGISTER_DECODER (EIGHTSVX_EXP, eightsvx_exp);
REGISTER_DECODER (EIGHTSVX_FIB, eightsvx_fib);
@@@ -84,9 -85,8 +85,9 @@@
REGISTER_DECODER (FRAPS, fraps);
REGISTER_ENCDEC (GIF, gif);
REGISTER_ENCDEC (H261, h261);
- REGISTER_DECODER (H263, h263);
+ REGISTER_ENCDEC (H263, h263);
REGISTER_DECODER (H263I, h263i);
+ REGISTER_ENCODER (H263P, h263p);
REGISTER_DECODER (H264, h264);
REGISTER_DECODER (H264_VDPAU, h264_vdpau);
REGISTER_ENCDEC (HUFFYUV, huffyuv);
@@@ -106,14 -106,14 +107,14 @@@
REGISTER_DECODER (MOTIONPIXELS, motionpixels);
REGISTER_DECODER (MPEG_XVMC, mpeg_xvmc);
REGISTER_ENCDEC (MPEG1VIDEO, mpeg1video);
- REGISTER_DECODER (MPEG2VIDEO, mpeg2video);
- REGISTER_DECODER (MPEG4, mpeg4);
+ REGISTER_ENCDEC (MPEG2VIDEO, mpeg2video);
+ REGISTER_ENCDEC (MPEG4, mpeg4);
REGISTER_DECODER (MPEGVIDEO, mpegvideo);
REGISTER_DECODER (MPEG_VDPAU, mpeg_vdpau);
REGISTER_DECODER (MPEG1_VDPAU, mpeg1_vdpau);
- REGISTER_DECODER (MSMPEG4V1, msmpeg4v1);
- REGISTER_DECODER (MSMPEG4V2, msmpeg4v2);
- REGISTER_DECODER (MSMPEG4V3, msmpeg4v3);
+ REGISTER_ENCDEC (MSMPEG4V1, msmpeg4v1);
+ REGISTER_ENCDEC (MSMPEG4V2, msmpeg4v2);
+ REGISTER_ENCDEC (MSMPEG4V3, msmpeg4v3);
REGISTER_DECODER (MSRLE, msrle);
REGISTER_DECODER (MSVIDEO1, msvideo1);
REGISTER_DECODER (MSZH, mszh);
@@@ -293,6 -293,7 +294,7 @@@
REGISTER_ENCDEC (LIBGSM, libgsm);
REGISTER_ENCDEC (LIBGSM_MS, libgsm_ms);
REGISTER_ENCODER (LIBMP3LAME, libmp3lame);
+ REGISTER_DECODER (LIBOPENJPEG, libopenjpeg);
REGISTER_ENCDEC (LIBSCHROEDINGER, libschroedinger);
REGISTER_DECODER (LIBSPEEX, libspeex);
REGISTER_ENCODER (LIBTHEORA, libtheora);
diff --combined libavcodec/mpegvideo_enc.c
index 9f94330,eb8b280..2500a41
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@@ -235,7 -235,7 +235,7 @@@ av_cold int MPV_encode_init(AVCodecCont
break;
case CODEC_ID_LJPEG:
case CODEC_ID_MJPEG:
- if(avctx->pix_fmt != PIX_FMT_YUVJ420P && avctx->pix_fmt != PIX_FMT_YUVJ422P &&
+ if(avctx->pix_fmt != PIX_FMT_YUVJ420P && avctx->pix_fmt != PIX_FMT_YUVJ422P && avctx->pix_fmt != PIX_FMT_RGB32 &&
((avctx->pix_fmt != PIX_FMT_YUV420P && avctx->pix_fmt != PIX_FMT_YUV422P) || avctx->strict_std_compliance>FF_COMPLIANCE_INOFFICIAL)){
av_log(avctx, AV_LOG_ERROR, "colorspace not supported in jpeg\n");
return -1;
@@@ -3715,29 -3715,7 +3715,29 @@@ int dct_quantize_c(MpegEncContext *s
return last_non_zero;
}
+AVCodec h263_encoder = {
+ "h263",
+ CODEC_TYPE_VIDEO,
+ CODEC_ID_H263,
+ sizeof(MpegEncContext),
+ MPV_encode_init,
+ MPV_encode_picture,
+ MPV_encode_end,
+ .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
+ .long_name= NULL_IF_CONFIG_SMALL("H.263 / H.263-1996"),
+};
+AVCodec h263p_encoder = {
+ "h263p",
+ CODEC_TYPE_VIDEO,
+ CODEC_ID_H263P,
+ sizeof(MpegEncContext),
+ MPV_encode_init,
+ MPV_encode_picture,
+ MPV_encode_end,
+ .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
+ .long_name= NULL_IF_CONFIG_SMALL("H.263+ / H.263-1998 / H.263 version 2"),
+};
AVCodec flv_encoder = {
"flv",
@@@ -3748,7 -3726,7 +3748,7 @@@
MPV_encode_picture,
MPV_encode_end,
.pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
- .long_name= NULL_IF_CONFIG_SMALL("Flash Video"),
+ .long_name= NULL_IF_CONFIG_SMALL("Flash Video (FLV)"),
};
AVCodec rv10_encoder = {
@@@ -3775,54 -3753,9 +3775,54 @@@ AVCodec rv20_encoder =
.long_name= NULL_IF_CONFIG_SMALL("RealVideo 2.0"),
};
+AVCodec mpeg4_encoder = {
+ "mpeg4",
+ CODEC_TYPE_VIDEO,
+ CODEC_ID_MPEG4,
+ sizeof(MpegEncContext),
+ MPV_encode_init,
+ MPV_encode_picture,
+ MPV_encode_end,
+ .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
+ .capabilities= CODEC_CAP_DELAY,
+ .long_name= NULL_IF_CONFIG_SMALL("MPEG-4 part 2"),
+};
+AVCodec msmpeg4v1_encoder = {
+ "msmpeg4v1",
+ CODEC_TYPE_VIDEO,
+ CODEC_ID_MSMPEG4V1,
+ sizeof(MpegEncContext),
+ MPV_encode_init,
+ MPV_encode_picture,
+ MPV_encode_end,
+ .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
+ .long_name= NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 1"),
+};
+AVCodec msmpeg4v2_encoder = {
+ "msmpeg4v2",
+ CODEC_TYPE_VIDEO,
+ CODEC_ID_MSMPEG4V2,
+ sizeof(MpegEncContext),
+ MPV_encode_init,
+ MPV_encode_picture,
+ MPV_encode_end,
+ .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
+ .long_name= NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 2"),
+};
+AVCodec msmpeg4v3_encoder = {
+ "msmpeg4",
+ CODEC_TYPE_VIDEO,
+ CODEC_ID_MSMPEG4V3,
+ sizeof(MpegEncContext),
+ MPV_encode_init,
+ MPV_encode_picture,
+ MPV_encode_end,
+ .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
+ .long_name= NULL_IF_CONFIG_SMALL("MPEG-4 part 2 Microsoft variant version 3"),
+};
AVCodec wmv1_encoder = {
"wmv1",
--
FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list