Commit 6aaff88f authored by Carl Eugen Hoyos's avatar Carl Eugen Hoyos

Revert r13542: Spatial direct mode probably also works with PAFF.

Originally committed as revision 14332 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent c32867b5
...@@ -4117,8 +4117,6 @@ static int decode_slice_header(H264Context *h, H264Context *h0){ ...@@ -4117,8 +4117,6 @@ static int decode_slice_header(H264Context *h, H264Context *h0){
if(h->slice_type_nos != FF_I_TYPE){ if(h->slice_type_nos != FF_I_TYPE){
if(h->slice_type_nos == FF_B_TYPE){ if(h->slice_type_nos == FF_B_TYPE){
h->direct_spatial_mv_pred= get_bits1(&s->gb); h->direct_spatial_mv_pred= get_bits1(&s->gb);
if(FIELD_PICTURE && h->direct_spatial_mv_pred)
av_log(h->s.avctx, AV_LOG_ERROR, "PAFF + spatial direct mode is not implemented\n");
} }
num_ref_idx_active_override_flag= get_bits1(&s->gb); num_ref_idx_active_override_flag= get_bits1(&s->gb);
......
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