diff options
| author | Ted Hess <thess@kitschensync.net> | 2014-11-01 19:44:12 -0400 |
|---|---|---|
| committer | Ted Hess <thess@kitschensync.net> | 2014-11-01 20:00:06 -0400 |
| commit | 122e36be3a37e3192a8963eb20a5e090a4bc915a (patch) | |
| tree | deddc0c1e43f13188a2d27afb5813ed635856e1f /sound/sox/patches | |
| parent | 6b11fa45d9c3e55991c5df7d9f90de5a845be5c0 (diff) | |
sox: update ffmpeg patches for 2.4.x (deprecated functions), add myself as pkg maintainer
Signed-off-by: Ted Hess <thess@kitschensync.net>
Diffstat (limited to 'sound/sox/patches')
| -rw-r--r-- | sound/sox/patches/020-ffmpeg-2.x.patch | 33 |
1 files changed, 31 insertions, 2 deletions
diff --git a/sound/sox/patches/020-ffmpeg-2.x.patch b/sound/sox/patches/020-ffmpeg-2.x.patch index 577014564..44e7ebbe9 100644 --- a/sound/sox/patches/020-ffmpeg-2.x.patch +++ b/sound/sox/patches/020-ffmpeg-2.x.patch @@ -20,7 +20,25 @@ return -1; if (enc->codec_type != AVMEDIA_TYPE_AUDIO) { lsx_fail("ffmpeg CODEC %x is not an audio CODEC", enc->codec_type); -@@ -267,7 +271,11 @@ static int stopread(sox_format_t * ft) +@@ -178,7 +182,7 @@ static int startread(sox_format_t * ft) + } + + /* Get CODEC parameters */ +- if ((ret = av_find_stream_info(ffmpeg->ctxt)) < 0) { ++ if ((ret = avformat_find_stream_info(ffmpeg->ctxt, NULL)) < 0) { + lsx_fail("ffmpeg could not find CODEC parameters for %s", ft->filename); + return SOX_EOF; + } +@@ -256,7 +260,7 @@ static int stopread(sox_format_t * ft) + if (ffmpeg->audio_stream >= 0) + stream_component_close(ffmpeg, ffmpeg->audio_stream); + if (ffmpeg->ctxt) { +- av_close_input_file(ffmpeg->ctxt); ++ avformat_close_input(&ffmpeg->ctxt); + ffmpeg->ctxt = NULL; /* safety */ + } + +@@ -267,16 +271,21 @@ static int stopread(sox_format_t * ft) /* * add an audio output stream */ @@ -32,7 +50,18 @@ { AVCodecContext *c; AVStream *st; -@@ -306,7 +314,7 @@ static int open_audio(priv_t * ffmpeg, A + +- st = av_new_stream(oc, 1); ++ st = avformat_new_stream(oc, NULL); + if (!st) { + lsx_fail("ffmpeg could not alloc stream"); + return NULL; + } ++ st->id = 1; + + c = st->codec; + c->codec_id = codec_id; +@@ -306,7 +315,7 @@ static int open_audio(priv_t * ffmpeg, A } /* open it */ |