[FFmpeg-cvslog] Merge commit 'c330eba84cf2370ad72423aa9e410e20afdc52e2'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue May 28 09:50:15 2013 +0200| [f6beb3611534e131b3f95036799b32735f6ab2f2] | committer: Michael Niedermayer

Merge commit 'c330eba84cf2370ad72423aa9e410e20afdc52e2'

* commit 'c330eba84cf2370ad72423aa9e410e20afdc52e2':
  lavf: preserve side data when parsing packets.

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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