[FFmpeg-cvslog] Merge commit 'a717f9904227d7979473bad40c50eb40af41d01d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan 21 13:45:32 2013 +0100| [c3f3c2256325532eb9ee8a44f1f43c31de79eb2f] | committer: Michael Niedermayer

Merge commit 'a717f9904227d7979473bad40c50eb40af41d01d'

* commit 'a717f9904227d7979473bad40c50eb40af41d01d':
  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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c3f3c2256325532eb9ee8a44f1f43c31de79eb2f
---