diff options
| author | rfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-01-11 05:06:48 +0000 |
|---|---|---|
| committer | rfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-01-11 05:06:48 +0000 |
| commit | f6ffd63f4b8243f0c15908858381570f72f8d10f (patch) | |
| tree | 506342351161c8d584d08643b05ea5c9ead111dd /libmpcodecs | |
| parent | 293eef76bfbd51ded6fd146c6ec786c14c3c3e60 (diff) | |
| download | mpv-f6ffd63f4b8243f0c15908858381570f72f8d10f.tar.bz2 mpv-f6ffd63f4b8243f0c15908858381570f72f8d10f.tar.xz | |
I hope this works as expected with old lavc versions. At least it compiles now.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8886 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/vd_ffmpeg.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index c7324c9dc6..728b2e5251 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -45,6 +45,11 @@ LIBVD_EXTERN(ffmpeg) #define coded_frame coded_picture #endif +#if LIBAVCODEC_BUILD < 4654 +#define PIX_FMT_RGB24 PIX_FMT_BGR24 +#define PIX_FMT_RGBA32 PIX_FMT_BGRA32 +#endif + int avcodec_inited=0; #if defined(FF_POSTPROCESS) && defined(MBR) @@ -350,8 +355,8 @@ static int init_vo(sh_video_t *sh){ case PIX_FMT_YUV444P: ctx->best_csp=IMGFMT_444P;break; //photo jpeg case PIX_FMT_YUV411P: ctx->best_csp=IMGFMT_411P;break; //dv ntsc case PIX_FMT_YUV422: ctx->best_csp=IMGFMT_YUY2;break; //huffyuv perhaps in the future - case PIX_FMT_BGR24 : ctx->best_csp=IMGFMT_BGR24;break; //huffyuv - case PIX_FMT_BGRA32: ctx->best_csp=IMGFMT_BGR32;break; //huffyuv + case PIX_FMT_RGB24 : ctx->best_csp=IMGFMT_BGR24;break; //huffyuv + case PIX_FMT_RGBA32: ctx->best_csp=IMGFMT_BGR32;break; //huffyuv default: ctx->best_csp=0; } |