diff options
| author | Parabola <dev@list.parabolagnulinux.org> | 2012-05-04 20:00:41 +0000 |
|---|---|---|
| committer | Parabola <dev@list.parabolagnulinux.org> | 2012-05-04 20:00:41 +0000 |
| commit | b2c353d874b85e06f355a9419852e2616613c7d0 (patch) | |
| tree | f0773e0a930d308198ef5036d4f74e7f53015e6e /extra/sox | |
| parent | 0a24fb835cac4007388213ad0afb15257b035b14 (diff) | |
Fri May 4 20:00:31 UTC 2012
Diffstat (limited to 'extra/sox')
| -rw-r--r-- | extra/sox/sox-14.3.2-ffmpeg.patch | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/extra/sox/sox-14.3.2-ffmpeg.patch b/extra/sox/sox-14.3.2-ffmpeg.patch deleted file mode 100644 index 5289b9b47..000000000 --- a/extra/sox/sox-14.3.2-ffmpeg.patch +++ /dev/null @@ -1,40 +0,0 @@ -Index: sox-14.3.2/src/ffmpeg.c -=================================================================== ---- sox-14.3.2.orig/src/ffmpeg.c -+++ sox-14.3.2/src/ffmpeg.c -@@ -91,7 +91,7 @@ static int stream_component_open(priv_t - - if (!codec || avcodec_open(enc, codec) < 0) - return -1; -- if (enc->codec_type != CODEC_TYPE_AUDIO) { -+ if (enc->codec_type != AVMEDIA_TYPE_AUDIO) { - lsx_fail("ffmpeg CODEC %x is not an audio CODEC", enc->codec_type); - return -1; - } -@@ -182,7 +182,7 @@ static int startread(sox_format_t * ft) - /* Find audio stream (FIXME: allow different stream to be selected) */ - for (i = 0; (unsigned)i < ffmpeg->ctxt->nb_streams; i++) { - AVCodecContext *enc = ffmpeg->ctxt->streams[i]->codec; -- if (enc->codec_type == CODEC_TYPE_AUDIO && ffmpeg->audio_index < 0) { -+ if (enc->codec_type == AVMEDIA_TYPE_AUDIO && ffmpeg->audio_index < 0) { - ffmpeg->audio_index = i; - break; - } -@@ -273,7 +273,7 @@ static AVStream *add_audio_stream(sox_fo - - c = st->codec; - c->codec_id = codec_id; -- c->codec_type = CODEC_TYPE_AUDIO; -+ c->codec_type = AVMEDIA_TYPE_AUDIO; - - /* put sample parameters */ - c->bit_rate = 256000; /* FIXME: allow specification */ -@@ -423,7 +423,7 @@ static size_t write_samples(sox_format_t - av_init_packet(&pkt); - pkt.size = avcodec_encode_audio(c, ffmpeg->audio_buf_aligned, AVCODEC_MAX_AUDIO_FRAME_SIZE, ffmpeg->samples); - pkt.pts = av_rescale_q(c->coded_frame->pts, c->time_base, ffmpeg->audio_st->time_base); -- pkt.flags |= PKT_FLAG_KEY; -+ pkt.flags |= AV_PKT_FLAG_KEY; - pkt.stream_index = ffmpeg->audio_st->index; - pkt.data = ffmpeg->audio_buf_aligned; - |