merging s->first_gob_line & s->first_slice_line

Originally committed as revision 640 to svn://svn.ffmpeg.org/ffmpeg/trunk