Merge commit '2219e27b5b17d146e4ab71a3ed86dfc013fb7a93'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 29 Jul 2013 10:53:57 +0000 (12:53 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 29 Jul 2013 11:01:20 +0000 (13:01 +0200)
* commit '2219e27b5b17d146e4ab71a3ed86dfc013fb7a93':
  oma: correctly mark and decrypt partial packets

Conflicts:
libavformat/omadec.c

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

Simple merge