Merge commit '078d43e23a7a3d64aafee8a58b380d3e139b3020'

[android-x86/external-ffmpeg.git] / libavformat / rtpdec_mpegts.c

diff --git a/libavformat/rtpdec_mpegts.c b/libavformat/rtpdec_mpegts.c
index eb88873..6b9c676 100644 (file)
--- a/libavformat/rtpdec_mpegts.c
+++ b/libavformat/rtpdec_mpegts.c
@@ -2,20 +2,20 @@
  * RTP MPEG2TS depacketizer
  * Copyright (c) 2003 Fabrice Bellard
  *
- * This file is part of Libav.
+ * This file is part of FFmpeg.
  *
- * Libav is free software; you can redistribute it and/or
+ * 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.1 of the License, or (at your option) any later version.
  *
- * Libav 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 Libav; if not, write to the Free Software
+ * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
@@ -35,13 +35,13 @@ static void mpegts_free_context(PayloadContext *data)
     if (!data)
         return;
     if (data->ts)
-        ff_mpegts_parse_close(data->ts);
+        avpriv_mpegts_parse_close(data->ts);
 }
 
 static av_cold int mpegts_init(AVFormatContext *ctx, int st_index,
                                PayloadContext *data)
 {
-    data->ts = ff_mpegts_parse_open(ctx);
+    data->ts = avpriv_mpegts_parse_open(ctx);
     if (!data->ts)
         return AVERROR(ENOMEM);
     return 0;
@@ -63,8 +63,8 @@ static int mpegts_handle_packet(AVFormatContext *ctx, PayloadContext *data,
     if (!buf) {
         if (data->read_buf_index >= data->read_buf_size)
             return AVERROR(EAGAIN);
-        ret = ff_mpegts_parse_packet(data->ts, pkt, data->buf + data->read_buf_index,
-                                     data->read_buf_size - data->read_buf_index);
+        ret = avpriv_mpegts_parse_packet(data->ts, pkt, data->buf + data->read_buf_index,
+                                         data->read_buf_size - data->read_buf_index);
         if (ret < 0)
             return AVERROR(EAGAIN);
         data->read_buf_index += ret;
@@ -74,8 +74,8 @@ static int mpegts_handle_packet(AVFormatContext *ctx, PayloadContext *data,
             return 0;
     }
 
-    ret = ff_mpegts_parse_packet(data->ts, pkt, buf, len);
-    /* The only error that can be returned from ff_mpegts_parse_packet
+    ret = avpriv_mpegts_parse_packet(data->ts, pkt, buf, len);
+    /* The only error that can be returned from avpriv_mpegts_parse_packet
      * is "no more data to return from the provided buffer", so return
      * AVERROR(EAGAIN) for all errors */
     if (ret < 0)