* commit '77b2cd7b41d7ec8008b6fac753c04f77824c514c': AVFrame: add side data. Conflicts: libavutil/frame.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
17 KiB
17 KiB
* commit '77b2cd7b41d7ec8008b6fac753c04f77824c514c': AVFrame: add side data. Conflicts: libavutil/frame.h Merged-by: Michael Niedermayer <michaelni@gmx.at>