diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-04 21:17:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-04 21:17:52 +0200 |
| commit | 4480edcf312b8d4350201eca047ccdd2c27f8517 (patch) | |
| tree | dbca26f831a32c9638f0aab77daaee0eda3caf86 /libavdevice | |
| parent | 6cecb8915aa8fa8b55f494f9dd05cce1a4c36093 (diff) | |
| parent | 91dffb4c1dfc7232e74ab86536afe39a777fc12d (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
w32threads: Make pthread_cond_wait follow POSIX
cosmetics: Consistently place static, inline and av_cold attributes/keywords.
sbrdsp: Use standard multiple inclusion guards.
pcm: K&R formatting cosmetics
rawdec: Support fourccs YV16 and YV24
rtmp: implement bandwidth notification
rtmp: update supported audio codecs value
Conflicts:
libavcodec/pcm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice')
| -rw-r--r-- | libavdevice/fbdev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavdevice/fbdev.c b/libavdevice/fbdev.c index 92afaefc32..77e91d77e9 100644 --- a/libavdevice/fbdev.c +++ b/libavdevice/fbdev.c @@ -95,7 +95,7 @@ typedef struct { uint8_t *data; ///< framebuffer data } FBDevContext; -av_cold static int fbdev_read_header(AVFormatContext *avctx) +static av_cold int fbdev_read_header(AVFormatContext *avctx) { FBDevContext *fbdev = avctx->priv_data; AVStream *st = NULL; @@ -234,7 +234,7 @@ static int fbdev_read_packet(AVFormatContext *avctx, AVPacket *pkt) return fbdev->frame_size; } -av_cold static int fbdev_read_close(AVFormatContext *avctx) +static av_cold int fbdev_read_close(AVFormatContext *avctx) { FBDevContext *fbdev = avctx->priv_data; |