Merge commit '5afe1d27912be9b643ffb4ddc21f6d920260dbb0'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 8 Aug 2013 10:04:46 +0000 (12:04 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 8 Aug 2013 10:04:46 +0000 (12:04 +0200)
* commit '5afe1d27912be9b643ffb4ddc21f6d920260dbb0':
  avio: Add const qualifiers to ffio_read_indirect

Conflicts:
libavformat/mpegts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/avio_internal.h
libavformat/aviobuf.c
libavformat/mpegts.c

Simple merge
Simple merge
@@@ -1958,8 -1792,8 +1958,8 @@@ static void finished_reading_packet(AVF
  static int handle_packets(MpegTSContext *ts, int nb_packets)
  {
      AVFormatContext *s = ts->stream;
 -    uint8_t packet[TS_PACKET_SIZE+FF_INPUT_BUFFER_PADDING_SIZE];
 +    uint8_t packet[TS_PACKET_SIZE + FF_INPUT_BUFFER_PADDING_SIZE];
-     uint8_t *data;
+     const uint8_t *data;
      int packet_num, ret = 0;
  
      if (avio_tell(s->pb) != ts->last_pos) {