41ed7ab45f
* commit '41ed7ab45f': cosmetics: Fix spelling mistakes Merged-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
e3d0f49abb
* commit 'e3d0f49abb': mpegvideo: h263: Move all tables to a single file Conflicts: libavcodec/h263.h libavcodec/h263data.h Merged-by: Michael Niedermayer <michaelni@gmx.at>