Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from committags/n0.6.4bac3ab13ea) Signed-off-by: Anton Khirnov <anton@khirnov.net> (cherry picked from commit59a22afa0b) Conflicts: libavcodec/h264.c Signed-off-by: Reinhard Tartler <siretart@tauware.de>