The diff is now split in two as requested. Philip Langdale (2): h264_parser: Fix behaviour when PARSER_FLAG_COMPLETE_FRAMES is set. h264_parser: Fix whitespace after previous change. libavcodec/h264_parser.c | 27 ++++++++++++++------------- 1 files changed, 14 insertions(+), 13 deletions(-)