Merge commit '53abe32409f13687c864b3cda077a1aa906a2459'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 26 Jul 2014 23:57:34 +0000 (01:57 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 26 Jul 2014 23:57:34 +0000 (01:57 +0200)
* commit '53abe32409f13687c864b3cda077a1aa906a2459':
  avcodec: Mark argument in av_{parser|hwaccel|bitstream_filter}_next as const

Conflicts:
libavcodec/avcodec.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/avcodec.h
libavcodec/bitstream_filter.c
libavcodec/parser.c
libavcodec/utils.c

@@@ -4984,24 -4279,9 +4984,24 @@@ int av_bitstream_filter_filter(AVBitStr
                                 AVCodecContext *avctx, const char *args,
                                 uint8_t **poutbuf, int *poutbuf_size,
                                 const uint8_t *buf, int buf_size, int keyframe);
 +
 +/**
 + * Release bitstream filter context.
 + *
 + * @param bsf the bitstream filter context created with
 + * av_bitstream_filter_init(), can be NULL
 + */
  void av_bitstream_filter_close(AVBitStreamFilterContext *bsf);
  
- AVBitStreamFilter *av_bitstream_filter_next(AVBitStreamFilter *f);
 +/**
 + * If f is NULL, return the first registered bitstream filter,
 + * if f is non-NULL, return the next registered bitstream filter
 + * after f, or NULL if f is the last one.
 + *
 + * This function can be used to iterate over all registered bitstream
 + * filters.
 + */
+ AVBitStreamFilter *av_bitstream_filter_next(const AVBitStreamFilter *f);
  
  /* memory */
  
Simple merge
Simple merge
@@@ -3394,14 -2272,14 +3394,14 @@@ static AVHWAccel **last_hwaccel = &firs
  
  void av_register_hwaccel(AVHWAccel *hwaccel)
  {
 -    AVHWAccel **p = &first_hwaccel;
 -    while (*p)
 -        p = &(*p)->next;
 -    *p = hwaccel;
 +    AVHWAccel **p = last_hwaccel;
      hwaccel->next = NULL;
 +    while(*p || avpriv_atomic_ptr_cas((void * volatile *)p, NULL, hwaccel))
 +        p = &(*p)->next;
 +    last_hwaccel = &hwaccel->next;
  }
  
- AVHWAccel *av_hwaccel_next(AVHWAccel *hwaccel)
+ AVHWAccel *av_hwaccel_next(const AVHWAccel *hwaccel)
  {
      return hwaccel ? hwaccel->next : first_hwaccel;
  }