Browse Source

add FF_API_VIDEO_OLD define to disable the deprecated decode_video API

Originally committed as revision 25272 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/n0.8
Aurelien Jacobs 15 years ago
parent
commit
164bc38c26
2 changed files with 5 additions and 2 deletions
  1. +4
    -1
      libavcodec/avcodec.h
  2. +1
    -1
      libavcodec/utils.c

+ 4
- 1
libavcodec/avcodec.h View File

@@ -60,6 +60,9 @@
#ifndef FF_API_AUDIO_OLD
#define FF_API_AUDIO_OLD (LIBAVCODEC_VERSION_MAJOR < 53)
#endif
#ifndef FF_API_VIDEO_OLD
#define FF_API_VIDEO_OLD (LIBAVCODEC_VERSION_MAJOR < 53)
#endif

#define AV_NOPTS_VALUE INT64_C(0x8000000000000000)
#define AV_TIME_BASE 1000000
@@ -3524,7 +3527,7 @@ int avcodec_decode_audio3(AVCodecContext *avctx, int16_t *samples,
int *frame_size_ptr,
AVPacket *avpkt);

#if LIBAVCODEC_VERSION_MAJOR < 53
#if FF_API_VIDEO_OLD
/**
* Decode a video frame from buf into picture.
* Wrapper function which calls avcodec_decode_video2.


+ 1
- 1
libavcodec/utils.c View File

@@ -591,7 +591,7 @@ int avcodec_encode_subtitle(AVCodecContext *avctx, uint8_t *buf, int buf_size,
return ret;
}

#if LIBAVCODEC_VERSION_MAJOR < 53
#if FF_API_VIDEO_OLD
int attribute_align_arg avcodec_decode_video(AVCodecContext *avctx, AVFrame *picture,
int *got_picture_ptr,
const uint8_t *buf, int buf_size)


Loading…
Cancel
Save