42 lines
1.4 KiB
Plaintext
42 lines
1.4 KiB
Plaintext
$OpenBSD: patch-modules_codec_avcodec_avcodec_h,v 1.5 2014/05/05 08:34:08 brad Exp $
|
|
|
|
Deal with newer FFmpeg API.
|
|
|
|
--- modules/codec/avcodec/avcodec.h.orig Fri Feb 21 10:27:16 2014
|
|
+++ modules/codec/avcodec/avcodec.h Thu Apr 24 21:19:42 2014
|
|
@@ -25,11 +25,6 @@
|
|
# include "config.h"
|
|
#endif
|
|
|
|
-#ifndef HAVE_AVUTIL_PLANAR
|
|
-# define av_sample_fmt_is_planar(x) (0)
|
|
-#endif
|
|
-
|
|
-
|
|
#include "chroma.h"
|
|
/* VLC <-> avcodec tables */
|
|
int GetFfmpegCodec( vlc_fourcc_t i_fourcc, int *pi_cat,
|
|
@@ -38,6 +33,8 @@ int GetVlcFourcc( int i_ffmpeg_codec, int *pi_cat,
|
|
vlc_fourcc_t *pi_fourcc, const char **ppsz_name );
|
|
vlc_fourcc_t GetVlcAudioFormat( int i_sample_fmt );
|
|
|
|
+unsigned GetVlcDspMask( void );
|
|
+
|
|
picture_t * DecodeVideo ( decoder_t *, block_t ** );
|
|
aout_buffer_t * DecodeAudio( decoder_t *, block_t ** );
|
|
subpicture_t *DecodeSubtitle( decoder_t *p_dec, block_t ** );
|
|
@@ -64,7 +61,6 @@ void EndVideoDec( decoder_t *p_dec );
|
|
/* Audio Decoder */
|
|
int InitAudioDec( decoder_t *p_dec, AVCodecContext *p_context,
|
|
AVCodec *p_codec, int i_codec_id, const char *psz_namecodec );
|
|
-void EndAudioDec( decoder_t *p_dec );
|
|
|
|
/* Subtitle Decoder */
|
|
int InitSubtitleDec( decoder_t *p_dec, AVCodecContext *p_context,
|
|
@@ -397,3 +393,5 @@ int ffmpeg_OpenCodec( decoder_t *p_dec );
|
|
#ifndef AV_PKT_FLAG_KEY
|
|
# define AV_PKT_FLAG_KEY PKT_FLAG_KEY
|
|
#endif
|
|
+
|
|
+#define MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
|