CCing the author of the commit that's being undone. Jyrki, you should set AV_CODEC_FLAG2_SKIP_MANUAL in AVCodecContext.flags2 to avoid lavc dropping any samples. Please let us know if this works for your case. -- Anton Khirnov