[SCM] libav/experimental: removing PIX_FMT_ANY
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:34:41 UTC 2013
The following commit has been merged in the experimental branch:
commit 2bbf71777fc447d24803f2287c257d5b41017b76
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Sun Dec 29 22:35:46 2002 +0000
removing PIX_FMT_ANY
Originally committed as revision 1373 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index a2a1d34..7ccd24b 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -60,7 +60,6 @@ enum CodecType {
};
enum PixelFormat {
- PIX_FMT_ANY = -1,
PIX_FMT_YUV420P,
PIX_FMT_YUV422,
PIX_FMT_RGB24,
diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c
index d1e88a9..bdf6fe6 100644
--- a/libavcodec/imgconvert.c
+++ b/libavcodec/imgconvert.c
@@ -720,8 +720,6 @@ int img_convert(AVPicture *dst, int dst_pix_fmt,
{
int i;
- assert(pix_fmt != PIX_FMT_ANY && dst_pix_fmt != PIX_FMT_ANY);
-
if (dst_pix_fmt == pix_fmt) {
switch(pix_fmt) {
case PIX_FMT_YUV420P:
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list