Michael Niedermayer 2fc662ae63 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>

2013-02-24 14:32:55 +01:00

3.9 KiB

Raw Blame History

View Raw