Merge commit 'c330eba84cf2370ad72423aa9e410e20afdc52e2'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 28 May 2013 07:50:15 +0000 (09:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 28 May 2013 07:51:19 +0000 (09:51 +0200)
* commit 'c330eba84cf2370ad72423aa9e410e20afdc52e2':
  lavf: preserve side data when parsing packets.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/utils.c

Simple merge