virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-14 00:58:38 +02:00
Code Issues Releases Activity

avisynth: Compact AvxSynth's avoidance of 2.6's colorspaces.

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Stephen Hutchinson 2013-10-28 16:52:46 -04:00 committed by Michael Niedermayer
parent 2c18bfe6af
commit d10d60be68
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavformat/avisynth.c
View File

@ -54,14 +54,6 @@
#define FreeLibrary dlclose #define FreeLibrary dlclose
#endif #endif
// AvxSynth doesn't have these colorspaces, so disable them
#ifndef _WIN32
#define avs_is_yv24(vi) 0
#define avs_is_yv16(vi) 0
#define avs_is_yv411(vi) 0
#define avs_is_y8(vi) 0
#endif
typedef struct { typedef struct {
void *library; void *library;
#define AVSC_DECLARE_FUNC(name) name ## _func name #define AVSC_DECLARE_FUNC(name) name ## _func name
@ -458,7 +450,11 @@ static int avisynth_read_packet_video(AVFormatContext *s, AVPacket *pkt,
pkt->dts = n; pkt->dts = n;
pkt->duration = 1; pkt->duration = 1;
// Define the bpp values for the new AviSynth 2.6 colorspaces #ifdef USING_AVISYNTH
/* Define the bpp values for the new AviSynth 2.6 colorspaces.
* Since AvxSynth doesn't have these functions, special-case
* it in order to avoid implicit declaration errors. */
if (avs_is_yv24(avs->vi)) if (avs_is_yv24(avs->vi))
bits = 24; bits = 24;
else if (avs_is_yv16(avs->vi)) else if (avs_is_yv16(avs->vi))
@ -468,6 +464,7 @@ static int avisynth_read_packet_video(AVFormatContext *s, AVPacket *pkt,
else if (avs_is_y8(avs->vi)) else if (avs_is_y8(avs->vi))
bits = 8; bits = 8;
else else
#endif
bits = avs_bits_per_pixel(avs->vi); bits = avs_bits_per_pixel(avs->vi);
/* Without the cast to int64_t, calculation overflows at about 9k x 9k /* Without the cast to int64_t, calculation overflows at about 9k x 9k