summaryrefslogtreecommitdiff
path: root/libavcodec/pnm.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-02-24 14:32:55 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-02-24 14:32:55 +0100
commit2fc662ae63ab79234f7c2996ad4e5c1993f85a18 (patch)
tree1d4d3299b037c1b12046ec68a41926da8412deea /libavcodec/pnm.h
parent5ecf8189c682f41ab315e171e0e7721d7e272138 (diff)
parent040c565e51985477a8fa5e42d2ddfb26ebde6608 (diff)
downloadffmpeg-2fc662ae63ab79234f7c2996ad4e5c1993f85a18.tar.gz
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>
Diffstat (limited to 'libavcodec/pnm.h')
-rw-r--r--libavcodec/pnm.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/pnm.h b/libavcodec/pnm.h
index ac4b1084fb..bb2cc77b87 100644
--- a/libavcodec/pnm.h
+++ b/libavcodec/pnm.h
@@ -34,7 +34,7 @@ typedef struct PNMContext {
} PNMContext;
int ff_pnm_decode_header(AVCodecContext *avctx, PNMContext * const s);
-av_cold int ff_pnm_end(AVCodecContext *avctx);
-av_cold int ff_pnm_init(AVCodecContext *avctx);
+int ff_pnm_end(AVCodecContext *avctx);
+int ff_pnm_init(AVCodecContext *avctx);
#endif /* AVCODEC_PNM_H */