diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-04-15 15:08:02 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-04-15 15:08:02 +0400 |
| commit | 427f56f1f0a3ceae1e27dc593bbb05b3919a1a2a (patch) | |
| tree | b6500605d0a4d8d20546359ba7c786d37ae90ab3 /intern/ffmpeg | |
| parent | 79ca1bd0041b05c5e15c87d381ebc721945a07e1 (diff) | |
Fix compilation with current FFmpeg trunk
AVCODEC_MAX_AUDIO_FRAME_SIZE was deprecated and
finally removed from current trunk.
Initial patch by Lawrence D'Oliveiro (ldo) with
own modification, Thanks!
Diffstat (limited to 'intern/ffmpeg')
| -rw-r--r-- | intern/ffmpeg/ffmpeg_compat.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/intern/ffmpeg/ffmpeg_compat.h b/intern/ffmpeg/ffmpeg_compat.h index cd56e3b28d2..e072796abc4 100644 --- a/intern/ffmpeg/ffmpeg_compat.h +++ b/intern/ffmpeg/ffmpeg_compat.h @@ -298,4 +298,9 @@ int64_t av_get_pts_from_frame(AVFormatContext *avctx, AVFrame * picture) return pts; } +/* obsolete constant formerly defined in FFMpeg libavcodec/avcodec.h */ +#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE +# define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio +#endif + #endif |