[FFmpeg-cvslog] lavf/oggdec: inline ogg_get_headers().

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <ubitux at gmail.com> | Fri Sep 14 23:05:57 2012 +0200| [bf8bfc6a1135ff0e7ae410f3468154bfe23fc1b6] | committer: Clément Bœsch

lavf/oggdec: inline ogg_get_headers().

There is no point in a distant definition of a small function like this
used only once.

Additional spacing to distinguish better the block.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bf8bfc6a1135ff0e7ae410f3468154bfe23fc1b6
---

 libavformat/oggdec.c |   27 ++++++++-------------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c
index 26aeb28..9bb63c3 100644
--- a/libavformat/oggdec.c
+++ b/libavformat/oggdec.c
@@ -475,22 +475,6 @@ static int ogg_packet(AVFormatContext *s, int *str, int *dstart, int *dsize,
     return 0;
 }
 
-static int ogg_get_headers(AVFormatContext *s)
-{
-    struct ogg *ogg = s->priv_data;
-    int ret;
-
-    do{
-        ret = ogg_packet(s, NULL, NULL, NULL, NULL);
-        if (ret < 0)
-            return ret;
-    }while (!ogg->headers);
-
-    av_dlog(s, "found headers\n");
-
-    return 0;
-}
-
 static int ogg_get_length(AVFormatContext *s)
 {
     struct ogg *ogg = s->priv_data;
@@ -556,11 +540,16 @@ static int ogg_read_header(AVFormatContext *s)
 {
     struct ogg *ogg = s->priv_data;
     int ret, i;
+
     ogg->curidx = -1;
+
     //linear headers seek from start
-    ret = ogg_get_headers(s);
-    if (ret < 0)
-        return ret;
+    do {
+        ret = ogg_packet(s, NULL, NULL, NULL, NULL);
+        if (ret < 0)
+            return ret;
+    } while (!ogg->headers);
+    av_dlog(s, "found headers\n");
 
     for (i = 0; i < ogg->nstreams; i++)
         if (ogg->streams[i].header < 0)