summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/video_dec/libvdpau/nal.c10
-rw-r--r--src/video_dec/libvdpau/vdpau_h264.c2
2 files changed, 5 insertions, 7 deletions
diff --git a/src/video_dec/libvdpau/nal.c b/src/video_dec/libvdpau/nal.c
index cacc21ddf..eb150cfda 100644
--- a/src/video_dec/libvdpau/nal.c
+++ b/src/video_dec/libvdpau/nal.c
@@ -42,12 +42,10 @@ void free_nal_buffer(struct nal_buffer *nal_buffer)
{
struct nal_unit *nal = nal_buffer->first;
- if(nal != NULL) {
- do {
- struct nal_unit *delete = nal;
- nal = nal->next;
- release_nal_unit(delete);
- } while(nal != NULL);
+ while (nal) {
+ struct nal_unit *delete = nal;
+ nal = nal->next;
+ release_nal_unit(delete);
}
free(nal_buffer);
diff --git a/src/video_dec/libvdpau/vdpau_h264.c b/src/video_dec/libvdpau/vdpau_h264.c
index 18a117508..433daee15 100644
--- a/src/video_dec/libvdpau/vdpau_h264.c
+++ b/src/video_dec/libvdpau/vdpau_h264.c
@@ -708,7 +708,7 @@ static void vdpau_h264_flush (video_decoder_t *this_gen) {
while ((decoded_pic = dpb_get_next_out_picture(&(this->nal_parser->dpb), 1)) != NULL) {
decoded_pic->img->top_field_first = dp_top_field_first(decoded_pic);
xprintf(this->xine, XINE_VERBOSITY_DEBUG,
- "h264 flush, draw pts: %lld\n", decoded_pic->img->pts);
+ "h264 flush, draw pts: %"PRId64"\n", decoded_pic->img->pts);
decoded_pic->img->draw(decoded_pic->img, this->stream);
dpb_set_output_picture(&(this->nal_parser->dpb), decoded_pic);
}