aboutsummaryrefslogtreecommitdiffstats
path: root/compat/avisynth
diff options
context:
space:
mode:
authorStephen Hutchinson <qyot27@gmail.com>2015-03-24 15:23:30 -0400
committerMichael Niedermayer <michaelni@gmx.at>2015-03-25 20:37:26 +0100
commit1492118c9d3c20b813991ad9e6fd30685583e0ef (patch)
treeba484d19eb0e3e498de813276f6b6a363b4d11a4 /compat/avisynth
parentbdcd36a4c81c50254f6204e83e0c14adc1391e66 (diff)
downloadandroid_external_ffmpeg-1492118c9d3c20b813991ad9e6fd30685583e0ef.tar.gz
android_external_ffmpeg-1492118c9d3c20b813991ad9e6fd30685583e0ef.tar.bz2
android_external_ffmpeg-1492118c9d3c20b813991ad9e6fd30685583e0ef.zip
avisynth: drop support of AviSynth 2.5
If the user attempts to use AviSynth 2.5, an error message will now tell them they need to upgrade. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'compat/avisynth')
-rw-r--r--compat/avisynth/avisynth_c_25.h68
1 files changed, 0 insertions, 68 deletions
diff --git a/compat/avisynth/avisynth_c_25.h b/compat/avisynth/avisynth_c_25.h
deleted file mode 100644
index 9288761331..0000000000
--- a/compat/avisynth/avisynth_c_25.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright (c) 2011 FFmpegSource Project
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-/* these are defines/functions that are used and were changed in the switch to 2.6
- * and are needed to maintain full compatility with 2.5 */
-
-enum {
- AVS_CS_YV12_25 = 1<<3 | AVS_CS_YUV | AVS_CS_PLANAR, // y-v-u, planar
- AVS_CS_I420_25 = 1<<4 | AVS_CS_YUV | AVS_CS_PLANAR, // y-u-v, planar
-};
-
-AVSC_INLINE int avs_get_height_p_25(const AVS_VideoFrame * p, int plane) {
- switch (plane)
- {
- case AVS_PLANAR_U: case AVS_PLANAR_V:
- if (p->pitchUV)
- return p->height>>1;
- return 0;
- }
- return p->height;}
-
-AVSC_INLINE int avs_get_row_size_p_25(const AVS_VideoFrame * p, int plane) {
- int r;
- switch (plane)
- {
- case AVS_PLANAR_U: case AVS_PLANAR_V:
- if (p->pitchUV)
- return p->row_size>>1;
- else
- return 0;
- case AVS_PLANAR_U_ALIGNED: case AVS_PLANAR_V_ALIGNED:
- if (p->pitchUV)
- {
- r = ((p->row_size+AVS_FRAME_ALIGN-1)&(~(AVS_FRAME_ALIGN-1)) )>>1; // Aligned rowsize
- if (r < p->pitchUV)
- return r;
- return p->row_size>>1;
- }
- else
- return 0;
- case AVS_PLANAR_Y_ALIGNED:
- r = (p->row_size+AVS_FRAME_ALIGN-1)&(~(AVS_FRAME_ALIGN-1)); // Aligned rowsize
- if (r <= p->pitch)
- return r;
- return p->row_size;
- }
- return p->row_size;
-}
-
-AVSC_INLINE int avs_is_yv12_25(const AVS_VideoInfo * p)
- { return ((p->pixel_type & AVS_CS_YV12_25) == AVS_CS_YV12_25)||((p->pixel_type & AVS_CS_I420_25) == AVS_CS_I420_25); }