there's no reason to stop SDL from doing audio playback conversions

This commit is contained in:
jakemsr 2009-01-24 11:00:41 +00:00
parent 53ef50a03a
commit 9465f22229
2 changed files with 28 additions and 2 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.43 2009/01/24 10:31:15 ajacoutot Exp $ # $OpenBSD: Makefile,v 1.44 2009/01/24 11:00:41 jakemsr Exp $
COMMENT= audio/video converter and streamer with bktr(4) support COMMENT= audio/video converter and streamer with bktr(4) support
V= 20080620 V= 20080620
DISTNAME= ffmpeg-svn-${V} DISTNAME= ffmpeg-svn-${V}
PKGNAME= ffmpeg-${V}p5 PKGNAME= ffmpeg-${V}p6
SHARED_LIBS= avutil 6.0 \ SHARED_LIBS= avutil 6.0 \
avcodec 13.0 \ avcodec 13.0 \
avformat 12.0 \ avformat 12.0 \

View File

@ -0,0 +1,26 @@
$OpenBSD: patch-ffplay_c,v 1.1 2009/01/24 11:00:41 jakemsr Exp $
--- ffplay.c.orig Thu Jan 22 02:43:05 2009
+++ ffplay.c Thu Jan 22 03:31:11 2009
@@ -1684,7 +1684,7 @@ static int stream_component_open(VideoState *is, int s
AVFormatContext *ic = is->ic;
AVCodecContext *enc;
AVCodec *codec;
- SDL_AudioSpec wanted_spec, spec;
+ SDL_AudioSpec wanted_spec;
if (stream_index < 0 || stream_index >= ic->nb_streams)
return -1;
@@ -1725,11 +1725,11 @@ static int stream_component_open(VideoState *is, int s
wanted_spec.samples = SDL_AUDIO_BUFFER_SIZE;
wanted_spec.callback = sdl_audio_callback;
wanted_spec.userdata = is;
- if (SDL_OpenAudio(&wanted_spec, &spec) < 0) {
+ if (SDL_OpenAudio(&wanted_spec, NULL) < 0) {
fprintf(stderr, "SDL_OpenAudio: %s\n", SDL_GetError());
return -1;
}
- is->audio_hw_buf_size = spec.size;
+ is->audio_hw_buf_size = wanted_spec.size;
}
if(thread_count>1)