summaryrefslogtreecommitdiffstats
path: root/libmpdemux/video.c
diff options
context:
space:
mode:
Diffstat (limited to 'libmpdemux/video.c')
-rw-r--r--libmpdemux/video.c21
1 files changed, 10 insertions, 11 deletions
diff --git a/libmpdemux/video.c b/libmpdemux/video.c
index 4af3f75529..b7e8aabb1b 100644
--- a/libmpdemux/video.c
+++ b/libmpdemux/video.c
@@ -106,7 +106,7 @@ video_codec_t video_codec = find_video_codec(sh_video);
switch(video_codec){
case VIDEO_OTHER: {
if((d_video->demuxer->file_format == DEMUXER_TYPE_ASF) || (d_video->demuxer->file_format == DEMUXER_TYPE_AVI)) {
- // display info:
+ // display info:
// in case no strf chunk has been seen in avi, we have no bitmap header
if(!sh_video->bih) return 0;
sh_video->format=sh_video->bih->biCompression;
@@ -147,13 +147,13 @@ switch(video_codec){
}
}
pos = videobuf_len+4;
- if(!read_video_packet(d_video)){
+ if(!read_video_packet(d_video)){
mp_msg(MSGT_DECVIDEO,MSGL_ERR,"Can't read Video Object Layer Header\n");
return 0;
}
mp4_header_process_vol(&picture, &(videobuffer[pos]));
mp_msg(MSGT_DECVIDEO,MSGL_V,"OK! FPS SEEMS TO BE %.3f\nSearching for Video Object Plane Start code... ", sh_video->fps);
- mp4_init:
+ mp4_init:
while(1){
int i=sync_video_packet(d_video);
if(i==0x1B6) break; // found it!
@@ -163,7 +163,7 @@ switch(video_codec){
}
}
pos = videobuf_len+4;
- if(!read_video_packet(d_video)){
+ if(!read_video_packet(d_video)){
mp_msg(MSGT_DECVIDEO,MSGL_ERR,"Can't read Video Object Plane Header\n");
return 0;
}
@@ -177,7 +177,7 @@ switch(video_codec){
goto mp4_init;
i=0;
- mn = mx = units[0];
+ mn = mx = units[0];
for(i=0; i<3; i++) {
if(units[i] < mn)
mn = units[i];
@@ -230,7 +230,7 @@ switch(video_codec){
}
}
pos = videobuf_len+4;
- if(!read_video_packet(d_video)){
+ if(!read_video_packet(d_video)){
mp_msg(MSGT_DECVIDEO,MSGL_ERR,"Can't read sequence parameter set\n");
return 0;
}
@@ -293,17 +293,17 @@ mpeg_header_parser:
}
}
- if(!read_video_packet(d_video)){
+ if(!read_video_packet(d_video)){
mp_tmsg(MSGT_DECVIDEO,MSGL_ERR,"FATAL: Cannot read sequence header.\n");
return 0;
}
if(mp_header_process_sequence_header (&picture, &videobuffer[4])) {
- mp_tmsg(MSGT_DECVIDEO,MSGL_ERR,"MPEG: bad sequence header\n");
+ mp_tmsg(MSGT_DECVIDEO,MSGL_ERR,"MPEG: bad sequence header\n");
goto mpeg_header_parser;
}
if(sync_video_packet(d_video)==0x1B5){ // next packet is seq. ext.
int pos=videobuf_len;
- if(!read_video_packet(d_video)){
+ if(!read_video_packet(d_video)){
mp_tmsg(MSGT_DECVIDEO,MSGL_ERR,"FATAL: Cannot read sequence header extension.\n");
return 0;
}
@@ -360,7 +360,7 @@ mpeg_header_parser:
return 0;
}
}
- if(!read_video_packet(d_video)){
+ if(!read_video_packet(d_video)){
mp_msg(MSGT_DECVIDEO,MSGL_ERR, "Couldn't read VC-1 sequence header!\n");
return 0;
}
@@ -644,4 +644,3 @@ int video_read_frame(sh_video_t* sh_video,float* frame_time_ptr,unsigned char**
if(frame_time_ptr) *frame_time_ptr=frame_time;
return in_size;
}
-