libavformat: Rename the applehttp protocol to hls

[ffmpeg] / libavformat / mxg.c

diff --git a/libavformat/mxg.c b/libavformat/mxg.c
index 81ffec6971e40ba57ad75aac83f16a7eb7390f62..3f8c3e339e49b8f3aac753d194e878568bcedee7 100644 (file)
--- a/libavformat/mxg.c
+++ b/libavformat/mxg.c
@@ -2,30 +2,29 @@
  * MxPEG clip file demuxer
  * Copyright (c) 2010 Anatoly Nenashev
  *
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav 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.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav 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 FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include "libavutil/intreadwrite.h"
 #include "libavcodec/mjpeg.h"
 #include "avformat.h"
+#include "internal.h"
 #include "avio.h"
 
-#define VIDEO_STREAM_INDEX 0
-#define AUDIO_STREAM_INDEX 1
 #define DEFAULT_PACKET_SIZE 1024
 #define OVERREAD_SIZE 3
 
@@ -38,20 +37,20 @@ typedef struct MXGContext {
     unsigned int cache_size;
 } MXGContext;
 
-static int mxg_read_header(AVFormatContext *s, AVFormatParameters *ap)
+static int mxg_read_header(AVFormatContext *s)
 {
     AVStream *video_st, *audio_st;
     MXGContext *mxg = s->priv_data;
 
     /* video parameters will be extracted from the compressed bitstream */
-    video_st = av_new_stream(s, VIDEO_STREAM_INDEX);
+    video_st = avformat_new_stream(s, NULL);
     if (!video_st)
         return AVERROR(ENOMEM);
     video_st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
     video_st->codec->codec_id = CODEC_ID_MXPEG;
-    av_set_pts_info(video_st, 64, 1, 1000000);
+    avpriv_set_pts_info(video_st, 64, 1, 1000000);
 
-    audio_st = av_new_stream(s, AUDIO_STREAM_INDEX);
+    audio_st = avformat_new_stream(s, NULL);
     if (!audio_st)
         return AVERROR(ENOMEM);
     audio_st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
@@ -60,7 +59,7 @@ static int mxg_read_header(AVFormatContext *s, AVFormatParameters *ap)
     audio_st->codec->sample_rate = 8000;
     audio_st->codec->bits_per_coded_sample = 8;
     audio_st->codec->block_align = 1;
-    av_set_pts_info(audio_st, 64, 1, 1000000);
+    avpriv_set_pts_info(audio_st, 64, 1, 1000000);
 
     mxg->soi_ptr = mxg->buffer_ptr = mxg->buffer = 0;
     mxg->buffer_size = 0;
@@ -132,7 +131,7 @@ static int mxg_read_packet(AVFormatContext *s, AVPacket *pkt)
     uint8_t *startmarker_ptr, *end, *search_end, marker;
     MXGContext *mxg = s->priv_data;
 
-    while (!url_feof(s->pb) && !url_ferror(s->pb)){
+    while (!s->pb->eof_reached && !s->pb->error){
         if (mxg->cache_size <= OVERREAD_SIZE) {
             /* update internal buffer */
             ret = mxg_update_cache(s, DEFAULT_PACKET_SIZE + OVERREAD_SIZE);
@@ -166,7 +165,7 @@ static int mxg_read_packet(AVFormatContext *s, AVPacket *pkt)
                 }
 
                 pkt->pts = pkt->dts = mxg->dts;
-                pkt->stream_index = VIDEO_STREAM_INDEX;
+                pkt->stream_index = 0;
                 pkt->destruct = NULL;
                 pkt->size = mxg->buffer_ptr - mxg->soi_ptr;
                 pkt->data = mxg->soi_ptr;
@@ -204,7 +203,7 @@ static int mxg_read_packet(AVFormatContext *s, AVPacket *pkt)
                 if (marker == APP13 && size >= 16) { /* audio data */
                     /* time (GMT) of first sample in usec since 1970, little-endian */
                     pkt->pts = pkt->dts = AV_RL64(startmarker_ptr + 8);
-                    pkt->stream_index = AUDIO_STREAM_INDEX;
+                    pkt->stream_index = 1;
                     pkt->destruct = NULL;
                     pkt->size = size - 14;
                     pkt->data = startmarker_ptr + 16;