diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-24 14:32:55 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-24 14:32:55 +0100 |
| commit | 2fc662ae63ab79234f7c2996ad4e5c1993f85a18 (patch) | |
| tree | 1d4d3299b037c1b12046ec68a41926da8412deea /libavcodec/mss2dsp.h | |
| parent | 5ecf8189c682f41ab315e171e0e7721d7e272138 (diff) | |
| parent | 040c565e51985477a8fa5e42d2ddfb26ebde6608 (diff) | |
| download | ffmpeg-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/mss2dsp.h')
| -rw-r--r-- | libavcodec/mss2dsp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mss2dsp.h b/libavcodec/mss2dsp.h index e04aab04d5..4d2966778b 100644 --- a/libavcodec/mss2dsp.h +++ b/libavcodec/mss2dsp.h @@ -45,6 +45,6 @@ typedef struct MSS2DSPContext { void (*upsample_plane)(uint8_t *plane, int plane_stride, int w, int h); } MSS2DSPContext; -av_cold void ff_mss2dsp_init(MSS2DSPContext* dsp); +void ff_mss2dsp_init(MSS2DSPContext *dsp); #endif /* AVCODEC_MSS2DSP_H */ |