revert bad checkin

[ffmpeg] / libavcodec / mp3lameaudio.c

diff --git a/libavcodec/mp3lameaudio.c b/libavcodec/mp3lameaudio.c
index 312a322c9ef6ce5d5a6232436240601f6a58bc2c..d13350265744ef8d2ba5117b620f8f873f1adce8 100644 (file)
--- a/libavcodec/mp3lameaudio.c
+++ b/libavcodec/mp3lameaudio.c
@@ -2,19 +2,21 @@
  * Interface to libmp3lame for mp3 encoding
  * Copyright (c) 2002 Lennert Buytenhek <buytenh@gnu.org>
  *
- * This library is free software; you can redistribute it and/or
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful,
+ * FFmpeg is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /**
@@ -28,51 +30,51 @@
 
 #define BUFFER_SIZE (2*MPA_FRAME_SIZE)
 typedef struct Mp3AudioContext {
-       lame_global_flags *gfp;
-       int stereo;
-        uint8_t buffer[BUFFER_SIZE];
-        int buffer_index;
+    lame_global_flags *gfp;
+    int stereo;
+    uint8_t buffer[BUFFER_SIZE];
+    int buffer_index;
 } Mp3AudioContext;
 
 static int MP3lame_encode_init(AVCodecContext *avctx)
 {
-       Mp3AudioContext *s = avctx->priv_data;
-
-       if (avctx->channels > 2)
-               return -1;
-
-       s->stereo = avctx->channels > 1 ? 1 : 0;
-
-       if ((s->gfp = lame_init()) == NULL)
-               goto err;
-       lame_set_in_samplerate(s->gfp, avctx->sample_rate);
-       lame_set_out_samplerate(s->gfp, avctx->sample_rate);
-       lame_set_num_channels(s->gfp, avctx->channels);
-       /* lame 3.91 dies on quality != 5 */
-       lame_set_quality(s->gfp, 5);
-       /* lame 3.91 doesn't work in mono */
-       lame_set_mode(s->gfp, JOINT_STEREO);
-       lame_set_brate(s->gfp, avctx->bit_rate/1000);
+    Mp3AudioContext *s = avctx->priv_data;
+
+    if (avctx->channels > 2)
+        return -1;
+
+    s->stereo = avctx->channels > 1 ? 1 : 0;
+
+    if ((s->gfp = lame_init()) == NULL)
+        goto err;
+    lame_set_in_samplerate(s->gfp, avctx->sample_rate);
+    lame_set_out_samplerate(s->gfp, avctx->sample_rate);
+    lame_set_num_channels(s->gfp, avctx->channels);
+    /* lame 3.91 dies on quality != 5 */
+    lame_set_quality(s->gfp, 5);
+    /* lame 3.91 doesn't work in mono */
+    lame_set_mode(s->gfp, JOINT_STEREO);
+    lame_set_brate(s->gfp, avctx->bit_rate/1000);
     if(avctx->flags & CODEC_FLAG_QSCALE) {
         lame_set_brate(s->gfp, 0);
         lame_set_VBR(s->gfp, vbr_default);
         lame_set_VBR_q(s->gfp, avctx->global_quality / (float)FF_QP2LAMBDA);
     }
-        lame_set_bWriteVbrTag(s->gfp,0);
-       if (lame_init_params(s->gfp) < 0)
-               goto err_close;
+    lame_set_bWriteVbrTag(s->gfp,0);
+    if (lame_init_params(s->gfp) < 0)
+        goto err_close;
 
-       avctx->frame_size = lame_get_framesize(s->gfp);
+    avctx->frame_size = lame_get_framesize(s->gfp);
 
-        avctx->coded_frame= avcodec_alloc_frame();
-        avctx->coded_frame->key_frame= 1;
+    avctx->coded_frame= avcodec_alloc_frame();
+    avctx->coded_frame->key_frame= 1;
 
-       return 0;
+    return 0;
 
 err_close:
-       lame_close(s->gfp);
+    lame_close(s->gfp);
 err:
-       return -1;
+    return -1;
 }
 
 static const int sSampleRates[3] = {
@@ -133,14 +135,14 @@ static int mp3len(void *data, int *samplesPerFrame, int *sampleRate)
     return *samplesPerFrame * bitRate / (bitsPerSlot * *sampleRate) + isPadded;
 }
 
-int MP3lame_encode_frame(AVCodecContext *avctx,
-                     unsigned char *frame, int buf_size, void *data)
+static int MP3lame_encode_frame(AVCodecContext *avctx,
+                                unsigned char *frame, int buf_size, void *data)
 {
-       Mp3AudioContext *s = avctx->priv_data;
-       int len;
-       int lame_result;
+    Mp3AudioContext *s = avctx->priv_data;
+    int len;
+    int lame_result;
 
-       /* lame 3.91 dies on '1-channel interleaved' data */
+    /* lame 3.91 dies on '1-channel interleaved' data */
 
     if(data){
         if (s->stereo) {
@@ -196,14 +198,14 @@ int MP3lame_encode_frame(AVCodecContext *avctx,
             return 0;
 }
 
-int MP3lame_encode_close(AVCodecContext *avctx)
+static int MP3lame_encode_close(AVCodecContext *avctx)
 {
-       Mp3AudioContext *s = avctx->priv_data;
+    Mp3AudioContext *s = avctx->priv_data;
 
-        av_freep(&avctx->coded_frame);
+    av_freep(&avctx->coded_frame);
 
-       lame_close(s->gfp);
-       return 0;
+    lame_close(s->gfp);
+    return 0;
 }