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/vc1.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/vc1.h')
| -rw-r--r-- | libavcodec/vc1.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/vc1.h b/libavcodec/vc1.h index 3a580dc228..596d4d35e5 100644 --- a/libavcodec/vc1.h +++ b/libavcodec/vc1.h @@ -454,9 +454,9 @@ int ff_vc1_parse_frame_header (VC1Context *v, GetBitContext *gb); int ff_vc1_parse_frame_header_adv(VC1Context *v, GetBitContext *gb); int ff_vc1_init_common(VC1Context *v); -av_cold int ff_vc1_decode_init_alloc_tables(VC1Context *v); -av_cold void ff_vc1_init_transposed_scantables(VC1Context *v); -av_cold int ff_vc1_decode_end(AVCodecContext *avctx); +int ff_vc1_decode_init_alloc_tables(VC1Context *v); +void ff_vc1_init_transposed_scantables(VC1Context *v); +int ff_vc1_decode_end(AVCodecContext *avctx); void ff_vc1_decode_blocks(VC1Context *v); #endif /* AVCODEC_VC1_H */ |