We should definitely remove all codec-specific options in AVCodecContext. We should also reorder the options to work with ffmpeg-mt, like x264 does -- so that copying a codec state to a thread can be done with a memcpy instead of explicitly copying every option. That is, make a section of the struct for things that need to be thread-synced. Jason