Merge 1.0.

diff --cc src/lib/encoder.cc
index 046a3248ef13fe0d3586cb6d6e41d3997a3913fb,eff38b6a57840ddbd3a3e3dcc9194f440f5503af..475c230da5ac1f3ba4458afd6cb55d062810e365
--- 1/src/lib/encoder.cc
--- 2/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@@ -216,8 -216,8 +216,8 @@@ Encoder::process_video (shared_ptr<Play
                TIMING ("adding to queue of %1", _queue.size ());
                _queue.push_back (shared_ptr<DCPVideoFrame> (
                                          new DCPVideoFrame (
 -                                                image->image(), _video_frames_out, eyes, conversion, _film->video_frame_rate(),
 +                                                image->image(PIX_FMT_RGB24, false), _video_frames_out, eyes, conversion, _film->video_frame_rate(),
-                                                 _film->j2k_bandwidth(), _film->log()
+                                                 _film->j2k_bandwidth(), _film->resolution(), _film->log()
                                                  )
                                          ));
                

diff --cc src/lib/types.h
Simple merge

diff --cc src/lib/video_content.cc
Simple merge

diff --cc src/lib/video_decoder.cc
index 3a88911118e4054bf2c2d2eecae6b59a50fa055a,e7ddec5e6cd19df910966a66fcb9e969b5c5b6ee..1503af955f7df8de4b6058038fac3142347c7b53
--- 1/src/lib/video_decoder.cc
--- 2/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@@ -44,9 -43,19 +44,16 @@@ VideoDecoder::video (shared_ptr<const I
        case VIDEO_FRAME_TYPE_3D_LEFT_RIGHT:
        {
                int const half = image->size().width / 2;
 -              Video (image->crop (Crop (0, half, 0, 0), true), EYES_LEFT, same, frame);
 -              Video (image->crop (Crop (half, 0, 0, 0), true), EYES_RIGHT, same, frame);
 +              _pending.push_back (shared_ptr<DecodedVideo> (new DecodedVideo (image->crop (Crop (0, half, 0, 0), true), EYES_LEFT, same, time)));
 +              _pending.push_back (shared_ptr<DecodedVideo> (new DecodedVideo (image->crop (Crop (half, 0, 0, 0), true), EYES_RIGHT, same, time)));
                break;
        }
+       case VIDEO_FRAME_TYPE_3D_TOP_BOTTOM:
+       {
+               int const half = image->size().height / 2;
+               Video (image->crop (Crop (0, 0, 0, half), true), EYES_LEFT, same, frame);
+               Video (image->crop (Crop (0, 0, half, 0), true), EYES_RIGHT, same, frame);
+               break;
+       }
        }
 -      
 -      _video_position = frame + 1;
  }
 -

diff --cc src/tools/server_test.cc
index cc500eeb00438c1a004cae2b81136e05a4a1c236,b2c5e784ba8caf2346c08b903c5a81dec8d8e296..38e4704b751e8882437b8d605e5fbb1415151f21
--- 1/src/tools/server_test.cc
--- 2/src/tools/server_test.cc
+++ b/src/tools/server_test.cc
@@@ -47,15 -47,10 +47,15 @@@ static shared_ptr<FileLog> log_ (new Fi
  static int frame = 0;
  
  void
 -process_video (shared_ptr<PlayerImage> image, Eyes eyes, ColourConversion conversion, Time)
 +process_video (shared_ptr<PlayerImage> image, Eyes eyes, ColourConversion conversion, DCPTime)
  {
 -      shared_ptr<DCPVideoFrame> local  (new DCPVideoFrame (image->image(), frame, eyes, conversion, film->video_frame_rate(), 250000000, RESOLUTION_2K, log_));
 -      shared_ptr<DCPVideoFrame> remote (new DCPVideoFrame (image->image(), frame, eyes, conversion, film->video_frame_rate(), 250000000, RESOLUTION_2K, log_));
 +      shared_ptr<DCPVideoFrame> local  (
-               new DCPVideoFrame (image->image (PIX_FMT_RGB24, false), frame, eyes, conversion, film->video_frame_rate(), 250000000, log_)
++              new DCPVideoFrame (image->image (PIX_FMT_RGB24, false), frame, eyes, conversion, film->video_frame_rate(), 250000000, RESOLUTION_2K, log_)
 +              );
 +      
 +      shared_ptr<DCPVideoFrame> remote (
-               new DCPVideoFrame (image->image (PIX_FMT_RGB24, false), frame, eyes, conversion, film->video_frame_rate(), 250000000, log_)
++              new DCPVideoFrame (image->image (PIX_FMT_RGB24, false), frame, eyes, conversion, film->video_frame_rate(), 250000000, RESOLUTION_2K, log_)
 +              );
  
        cout << "Frame " << frame << ": ";
        cout.flush ();

diff --cc src/wx/video_panel.cc
Simple merge