[FFmpeg-cvslog] Merge commit '36fc320747a768335ae4538a24a5739033b7eb74' into release/0.10

[Michael Niedermayer]

ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Mon Nov  4 18:50:00 2013 +0100| [e31518e86ee51c7d5b29afdf19a77bdeafe10cca] | committer: Michael Niedermayer

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 at gmx.at>

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