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)
commit2fc662ae63ab79234f7c2996ad4e5c1993f85a18
tree1d4d3299b037c1b12046ec68a41926da8412deea
parent5ecf8189c682f41ab315e171e0e7721d7e272138
parent040c565e51985477a8fa5e42d2ddfb26ebde6608
Merge commit '040c565e51985477a8fa5e42d2ddfb26ebde6608'

* 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:
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