summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2011-12-31 22:28:23 +0000
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2011-12-31 22:28:23 +0000
commit96801061c49f647d815b01375037484c374a813f (patch)
tree481fca17fb8397e4a1a6380d4eadf9ca6b51e24b
parentfc5e20969e6e15e7157f15e4368bfe51676be2ef (diff)
downloadxine-lib-96801061c49f647d815b01375037484c374a813f.tar.gz
xine-lib-96801061c49f647d815b01375037484c374a813f.tar.bz2
Kill a few trivial compiler warnings.
-rw-r--r--src/video_dec/libvdpau/Makefile.am2
-rw-r--r--src/video_dec/libvdpau/dpb.c2
-rw-r--r--src/video_dec/libvdpau/dpb.h2
-rw-r--r--src/video_dec/libvdpau/vdpau_h264.c2
-rw-r--r--src/video_dec/libvdpau/vdpau_mpeg4.c2
5 files changed, 5 insertions, 5 deletions
diff --git a/src/video_dec/libvdpau/Makefile.am b/src/video_dec/libvdpau/Makefile.am
index d5ffef8de..6d543470d 100644
--- a/src/video_dec/libvdpau/Makefile.am
+++ b/src/video_dec/libvdpau/Makefile.am
@@ -22,7 +22,7 @@ endif
xineplug_LTLIBRARIES = $(vdpau_h264_module) $(vdpau_h264_alter_module) $(vdpau_mpeg12_module) $(vdpau_vc1_module) $(vdpau_mpeg4_module)
xineplug_decode_vdpau_h264_alter_la_SOURCES = alterh264_decode.c
-xineplug_decode_vdpau_h264_alter_la_CFLAGS = $(AM_CFLAGS)
+xineplug_decode_vdpau_h264_alter_la_CFLAGS = $(AM_CFLAGS) -fno-strict-aliasing
xineplug_decode_vdpau_h264_alter_la_LIBADD = $(XINE_LIB) $(DYNAMIC_LD_LIBS)
xineplug_decode_vdpau_h264_la_SOURCES = nal.c dpb.c cpb.c h264_parser.c vdpau_h264.c
diff --git a/src/video_dec/libvdpau/dpb.c b/src/video_dec/libvdpau/dpb.c
index 60a755013..c2afd42ba 100644
--- a/src/video_dec/libvdpau/dpb.c
+++ b/src/video_dec/libvdpau/dpb.c
@@ -169,7 +169,7 @@ void free_decoded_picture(struct decoded_picture *pic)
* ----------------------------------------------------------------------------
*/
-struct dpb* create_dpb()
+struct dpb* create_dpb(void)
{
struct dpb *dpb = calloc(1, sizeof(struct dpb));
diff --git a/src/video_dec/libvdpau/dpb.h b/src/video_dec/libvdpau/dpb.h
index e8635ff75..356bcbf70 100644
--- a/src/video_dec/libvdpau/dpb.h
+++ b/src/video_dec/libvdpau/dpb.h
@@ -81,7 +81,7 @@ struct dpb {
int max_dpb_frames;
};
-struct dpb* create_dpb();
+struct dpb* create_dpb(void);
void release_dpb(struct dpb *dpb);
/**
diff --git a/src/video_dec/libvdpau/vdpau_h264.c b/src/video_dec/libvdpau/vdpau_h264.c
index 9bcddd9be..25ed62295 100644
--- a/src/video_dec/libvdpau/vdpau_h264.c
+++ b/src/video_dec/libvdpau/vdpau_h264.c
@@ -294,7 +294,7 @@ static void fill_vdpau_pictureinfo_h264(video_decoder_t *this_gen, uint32_t slic
}
-int check_progressive(video_decoder_t *this_gen, struct decoded_picture *dpic)
+static int check_progressive(video_decoder_t *this_gen, struct decoded_picture *dpic)
{
vdpau_h264_decoder_t *this = (vdpau_h264_decoder_t *)this_gen;
int progressive = 0;
diff --git a/src/video_dec/libvdpau/vdpau_mpeg4.c b/src/video_dec/libvdpau/vdpau_mpeg4.c
index 7d940a56b..4d7dee1ed 100644
--- a/src/video_dec/libvdpau/vdpau_mpeg4.c
+++ b/src/video_dec/libvdpau/vdpau_mpeg4.c
@@ -481,7 +481,7 @@ static void video_object_layer( vdpau_mpeg4_decoder_t *this_gen, uint8_t *buf, i
sequence->picture.vdp_infos.non_intra_quantizer_matrix[mpeg_scan_norm[j]] = default_non_intra_quantizer_matrix[j];
}
if ( picture->vdp_infos.quant_type ) {
- int val, last;
+ int val, last = 0;
if ( read_bits( &sequence->br, 1 ) ) { /* load_intra_quant_matrix */
lprintf("load_intra_quant_matrix\n");
for ( j=0; j<64; ++j ) {