diff options
| author | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2003-01-08 13:18:42 +0000 |
|---|---|---|
| committer | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2003-01-08 13:18:42 +0000 |
| commit | 6f1c8d4eafabd914b87e9171bf4d04f4ef9160ea (patch) | |
| tree | e70be493d1222b10f96aa5efac01c0ec0d5bcc97 /src/libffmpeg/libavcodec/imgconvert.c | |
| parent | 1fb58a63872660424777d41389e426dc90f1b660 (diff) | |
| download | xine-lib-6f1c8d4eafabd914b87e9171bf4d04f4ef9160ea.tar.gz xine-lib-6f1c8d4eafabd914b87e9171bf4d04f4ef9160ea.tar.bz2 | |
syncing ffmpeg (with some compilation fixes)
- fixes wma bugs
- mace, huffyuv and mp3 decoders imported (but not enabled)
tested: wma (v1 and v2), mpeg4, msmpeg4 v1, v2 and v3, divx3, divx4, divx5, xvid and
dv decoders. everything looks fine.
CVS patchset: 3828
CVS date: 2003/01/08 13:18:42
Diffstat (limited to 'src/libffmpeg/libavcodec/imgconvert.c')
| -rw-r--r-- | src/libffmpeg/libavcodec/imgconvert.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/libffmpeg/libavcodec/imgconvert.c b/src/libffmpeg/libavcodec/imgconvert.c index d1e88a970..bdf6fe65d 100644 --- a/src/libffmpeg/libavcodec/imgconvert.c +++ b/src/libffmpeg/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: |