While I had considered doing this, I wanted to avoid a monolithic function and thought this would be sufficient.  The old code isn't "unused" so much as it's just using the original avcodec_encode_audio interface.

What about simply, modfiying the function signature of s302m_encode_frame to something like:
s302_encode_audio(AVCodecContext *, AVPacket *, AVFrame *);