From 3f57a7f93b3e7550cbd73036f6a56654e17d1d5c Mon Sep 17 00:00:00 2001
From: tnut <tnut at nutyx dot com>
Date: Sun, 8 Jan 2012 12:15:45 +0100
Subject: split de git pakxe et NuTyX-extra

---
 extra/sox/sox-14.3.2-ffmpeg-0.8.patch | 38 -----------------------------------
 1 file changed, 38 deletions(-)
 delete mode 100644 extra/sox/sox-14.3.2-ffmpeg-0.8.patch

(limited to 'extra/sox/sox-14.3.2-ffmpeg-0.8.patch')

diff --git a/extra/sox/sox-14.3.2-ffmpeg-0.8.patch b/extra/sox/sox-14.3.2-ffmpeg-0.8.patch
deleted file mode 100644
index 023914694..000000000
--- a/extra/sox/sox-14.3.2-ffmpeg-0.8.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- 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;
- 
-- 
cgit v1.2.3-70-g09d2