diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2002-12-29 22:35:46 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2002-12-29 22:35:46 +0000 |
| commit | 2bbf71777fc447d24803f2287c257d5b41017b76 (patch) | |
| tree | 83c9769e7c4707f40b9be1f59050f9363d457567 | |
| parent | 5fe061a027edbd6283938c603ac139394922294b (diff) | |
| download | ffmpeg-2bbf71777fc447d24803f2287c257d5b41017b76.tar.gz | |
removing PIX_FMT_ANY
Originally committed as revision 1373 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/avcodec.h | 1 | ||||
| -rw-r--r-- | libavcodec/imgconvert.c | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index a2a1d3428e..7ccd24bffa 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 d1e88a9703..bdf6fe65d2 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: |