Commit c29e05e6 authored by Michael Niedermayer's avatar Michael Niedermayer

Remove another of these obfuscated special cases for field pictures

that does not do anything.

Originally committed as revision 14388 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent c7250900
...@@ -3551,9 +3551,7 @@ static int execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){ ...@@ -3551,9 +3551,7 @@ static int execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){
} }
} }
if (!current_ref_assigned && FIELD_PICTURE && if (!current_ref_assigned) {
!s->first_field && s->current_picture_ptr->reference) {
/* Second field of complementary field pair; the first field of /* Second field of complementary field pair; the first field of
* which is already referenced. If short referenced, it * which is already referenced. If short referenced, it
* should be first entry in short_ref. If not, it must exist * should be first entry in short_ref. If not, it must exist
...@@ -3569,17 +3567,6 @@ static int execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){ ...@@ -3569,17 +3567,6 @@ static int execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){
"in complementary field pair " "in complementary field pair "
"(first field is long term)\n"); "(first field is long term)\n");
} else { } else {
/*
* First field in reference, but not in any sensible place on our
* reference lists. This shouldn't happen unless reference
* handling somewhere else is wrong.
*/
assert(0);
}
current_ref_assigned = 1;
}
if(!current_ref_assigned){
pic= remove_short(h, s->current_picture_ptr->frame_num); pic= remove_short(h, s->current_picture_ptr->frame_num);
if(pic){ if(pic){
unreference_pic(h, pic, 0); unreference_pic(h, pic, 0);
......
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