diff options
author | tnut <tnut at nutyx dot com> | 2011-09-17 14:21:40 +0200 |
---|---|---|
committer | tnut <tnut at nutyx dot com> | 2011-09-17 14:21:40 +0200 |
commit | df18fbeb9e5494de6d463f7fa516e2fb40598b5f (patch) | |
tree | 76b9df45ba6cc9afa5576846c9c9ab64e65aa722 /extra/sox/sox-14.3.2-ffmpeg-0.8.patch | |
parent | 10b773b89fabe87e49c06019d7d0875d34335f79 (diff) | |
parent | 6e215aaf2efd3fc214681cce6a2dbddafe66cbce (diff) | |
download | nutyx-pakxe-df18fbeb9e5494de6d463f7fa516e2fb40598b5f.tar.gz nutyx-pakxe-df18fbeb9e5494de6d463f7fa516e2fb40598b5f.tar.bz2 nutyx-pakxe-df18fbeb9e5494de6d463f7fa516e2fb40598b5f.tar.xz nutyx-pakxe-df18fbeb9e5494de6d463f7fa516e2fb40598b5f.zip |
Merge branch 'master' of ssh://kiao.no-ip.info:443/~/pakxe
Diffstat (limited to 'extra/sox/sox-14.3.2-ffmpeg-0.8.patch')
-rw-r--r-- | extra/sox/sox-14.3.2-ffmpeg-0.8.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/extra/sox/sox-14.3.2-ffmpeg-0.8.patch b/extra/sox/sox-14.3.2-ffmpeg-0.8.patch new file mode 100644 index 000000000..023914694 --- /dev/null +++ b/extra/sox/sox-14.3.2-ffmpeg-0.8.patch @@ -0,0 +1,38 @@ +--- src/ffmpeg.c.ffmpeg 2011-06-24 12:54:05.000000000 +0200 ++++ src/ffmpeg.c 2011-06-24 12:55:19.000000000 +0200 +@@ -91,7 +91,7 @@ + + 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 @@ + /* 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 @@ + + 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 @@ + 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; + |