dccb4cb4de
bug fixes. ok sthen@
28 lines
1.1 KiB
Plaintext
28 lines
1.1 KiB
Plaintext
$OpenBSD: patch-modules_codec_avcodec_avcodec_h,v 1.1 2013/03/09 09:32:03 brad Exp $
|
|
--- modules/codec/avcodec/avcodec.h.orig Fri Mar 8 16:29:45 2013
|
|
+++ modules/codec/avcodec/avcodec.h Fri Mar 8 16:29:50 2013
|
|
@@ -21,13 +21,22 @@
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
|
|
*****************************************************************************/
|
|
|
|
+#ifdef HAVE_CONFIG_H
|
|
+# 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,
|
|
int *pi_ffmpeg_codec, const char **ppsz_name );
|
|
int GetVlcFourcc( int i_ffmpeg_codec, int *pi_cat,
|
|
vlc_fourcc_t *pi_fourcc, const char **ppsz_name );
|
|
-void GetVlcAudioFormat( vlc_fourcc_t *, unsigned *pi_bits, int i_sample_fmt );
|
|
+vlc_fourcc_t GetVlcAudioFormat( int i_sample_fmt );
|
|
|
|
picture_t * DecodeVideo ( decoder_t *, block_t ** );
|
|
aout_buffer_t * DecodeAudio( decoder_t *, block_t ** );
|