Commit 9d5de747 authored by kostya's avatar kostya

Print error message when true interlaced VC-1 frames are encountered

to inform user why decoder produces no output.



git-svn-id: file:///var/local/repositories/ffmpeg/trunk@20196 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent edbf0656
...@@ -781,7 +781,11 @@ int vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb) ...@@ -781,7 +781,11 @@ int vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb)
if(v->interlace){ if(v->interlace){
v->fcm = decode012(gb); v->fcm = decode012(gb);
if(v->fcm) return -1; // interlaced frames/fields are not implemented if(v->fcm){
if(!v->warn_interlaced++)
av_log(v->s.avctx, AV_LOG_ERROR, "Interlaced frames/fields support is not implemented\n");
return -1;
}
} }
switch(get_unary(gb, 0, 4)) { switch(get_unary(gb, 0, 4)) {
case 0: case 0:
......
...@@ -312,6 +312,8 @@ typedef struct VC1Context{ ...@@ -312,6 +312,8 @@ typedef struct VC1Context{
uint8_t closed_entry; ///< Closed entry point flag (CLOSED_ENTRY syntax element) uint8_t closed_entry; ///< Closed entry point flag (CLOSED_ENTRY syntax element)
int parse_only; ///< Context is used within parser int parse_only; ///< Context is used within parser
int warn_interlaced;
} VC1Context; } VC1Context;
/** Find VC-1 marker in buffer /** Find VC-1 marker in buffer
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment