* commit 'a717f990':
  mpegts: Share the cleanup code between the demuxer and lavf-internal parser functions
  rtpdec_mpeg4: Return one AAC AU per AVPacket
  ppc: Include string.h for memset
Merged-by: Michael Niedermayer <michaelni@gmx.at>