[FFmpeg-cvslog] Merge commit '0e8ae6d10c609bb968c141aa2436413a55852590' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Sun Jan 12 16:01:50 2014 +0100| [7e343798976991f4320c1c90b8d4fac4c2f9e355] | committer: Michael Niedermayer

Merge commit '0e8ae6d10c609bb968c141aa2436413a55852590' into release/1.1

* commit '0e8ae6d10c609bb968c141aa2436413a55852590':
  mpegvideo: Drop a faulty assert
  lavr: check that current_buffer is not NULL before using it
  pmpdec: check that there is at least one audio packet.
  lzw: switch to bytestream2
  gifdec: convert to bytestream2

Conflicts:
	libavcodec/gifdec.c
	libavcodec/lzw.c
	libavcodec/lzw.h
	libavformat/pmpdec.c

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

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