mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-24 13:56:33 +02:00
Merge commit '2d7d91f06d6a1d243dc74c96d3389ee237a3b906'
* commit '2d7d91f06d6a1d243dc74c96d3389ee237a3b906': svq1enc: Set picture_structure correctly mpegvideo: remove last_picture_ptr / h264 assert. mpegvideo_enc: remove assert that has become obsolete with the new API elbg: Fix an assert Conflicts: libavcodec/elbg.c libavcodec/mpegvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
743a295c09