MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-01-27 06:33:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix ffmpeg API breakage

Browse Source 
avcodec_audio_decode() has been removed in favor of avcodec_decode_audio2();
output buffer size must be passed to the function.
This commit is contained in:
Julien BLACHE 2009-04-05 16:37:28 +02:00
parent 888bf11d2f
commit 081a13bbea
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/ssc-ffmpeg.c
View File

@ -310,7 +310,7 @@ int ssc_ffmpeg_close(void *vp) {
} }
int _ssc_ffmpeg_read_frame(void *vp, char *buffer, int len) { int _ssc_ffmpeg_read_frame(void *vp, char *buffer, int buflen) {
SSCHANDLE *handle = (SSCHANDLE *)vp; SSCHANDLE *handle = (SSCHANDLE *)vp;
int data_size; int data_size;
int len1; int len1;
@ -329,11 +329,12 @@ int _ssc_ffmpeg_read_frame(void *vp, char *buffer, int len) {
if(!handle->file_bytes_read) if(!handle->file_bytes_read)
return 0; return 0;
len1 = avcodec_decode_audio(handle->pCodecCtx,(short*)buffer, out_size = buflen;
&out_size, len1 = avcodec_decode_audio2(handle->pCodecCtx,(short*)buffer,
(uint8_t*)handle->file_buffer_ptr, &out_size,
handle->file_bytes_read); (uint8_t*)handle->file_buffer_ptr,
handle->file_bytes_read);
if(len1 < 0) /* FIXME: Decode Error */ if(len1 < 0) /* FIXME: Decode Error */
return 0; return 0;
@ -355,11 +356,12 @@ int _ssc_ffmpeg_read_frame(void *vp, char *buffer, int len) {
while(1) { while(1) {
while(handle->packet_size > 0) { while(handle->packet_size > 0) {
len1=avcodec_decode_audio(handle->pCodecCtx, data_size = buflen;
(int16_t*)buffer, len1=avcodec_decode_audio2(handle->pCodecCtx,
&data_size, (int16_t*)buffer,
handle->packet_data, &data_size,
handle->packet_size); handle->packet_data,
handle->packet_size);
if(len1 < 0) { if(len1 < 0) {
/* skip frame */ /* skip frame */