Merge commit '040c565e51985477a8fa5e42d2ddfb26ebde6608'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 24 Feb 2013 13:32:55 +0000 (14:32 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 24 Feb 2013 13:32:55 +0000 (14:32 +0100)
* commit '040c565e51985477a8fa5e42d2ddfb26ebde6608':
  doc: developer: Allow tabs in the vim configuration for Automake files
  Remove pointless av_cold attributes in header files

Conflicts:
libavcodec/h264.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 files changed:
1  2 
doc/developer.texi
libavcodec/aacsbr.h
libavcodec/asv.h
libavcodec/fmtconvert.h
libavcodec/h264.h
libavcodec/ivi_common.h
libavcodec/mss12.h
libavcodec/mss2dsp.h
libavcodec/pnm.h
libavcodec/psymodel.h
libavcodec/vc1.h
libavcodec/wma_common.h

Simple merge
Simple merge
Simple merge
Simple merge
@@@ -733,9 -706,9 +733,9 @@@ int ff_h264_check_intra_pred_mode(H264C
  
  void ff_h264_hl_decode_mb(H264Context *h);
  int ff_h264_frame_start(H264Context *h);
 -int ff_h264_decode_extradata(H264Context *h);
 +int ff_h264_decode_extradata(H264Context *h, const uint8_t *buf, int size);
av_cold int ff_h264_decode_init(AVCodecContext *avctx);
av_cold void ff_h264_decode_init_vlc(void);
+ int ff_h264_decode_init(AVCodecContext *avctx);
+ void ff_h264_decode_init_vlc(void);
  
  /**
   * Decode a macroblock
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge