Merge commit 'ec4f04da1a3462dac429b9d15dee5f027309da15'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 27 Jul 2014 00:09:41 +0000 (02:09 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 27 Jul 2014 00:09:41 +0000 (02:09 +0200)
* commit 'ec4f04da1a3462dac429b9d15dee5f027309da15':
  avformat: Mark argument in av_{i|o}format_next/ffurl_protocol_next as const

Conflicts:
libavformat/format.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/avformat.h
libavformat/avio.c
libavformat/format.c
libavformat/url.h

Simple merge
Simple merge
@@@ -33,10 -32,7 +33,10 @@@ static AVInputFormat *first_iformat = N
  /** head of registered output format linked list */
  static AVOutputFormat *first_oformat = NULL;
  
- AVInputFormat *av_iformat_next(AVInputFormat *f)
 +static AVInputFormat **last_iformat = &first_iformat;
 +static AVOutputFormat **last_oformat = &first_oformat;
 +
+ AVInputFormat *av_iformat_next(const AVInputFormat *f)
  {
      if (f)
          return f->next;
Simple merge