Merge commit '36fc320747a768335ae4538a24a5739033b7eb74' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Nov 2013 17:50:00 +0000 (18:50 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Nov 2013 17:50:55 +0000 (18:50 +0100)
commite31518e86ee51c7d5b29afdf19a77bdeafe10cca
tree0014fc08a2473816248fcf861133ffeb9717dce2
parent1c896e865cfb5fdea82429a0506a1c5ad905a988
parent36fc320747a768335ae4538a24a5739033b7eb74
Merge commit '36fc320747a768335ae4538a24a5739033b7eb74' into release/0.10

* commit '36fc320747a768335ae4538a24a5739033b7eb74':
  nuv: Pad the lzo outbuf
  nuv: Do not ignore lzo decompression failures
  oma: correctly mark and decrypt partial packets
  oma: check geob tag boundary

Conflicts:
libavcodec/nuv.c
libavformat/omadec.c
tests/ref/fate/nuv

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/nuv.c
libavformat/omadec.c