[FFmpeg-cvslog] Merge commit 'b047c68783aa4042b322af7af043b643d5daf09c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Dec 23 14:36:47 2012 +0100| [def18e5470bdcddb9d737784cc6ae427c195da7c] | committer: Michael Niedermayer

Merge commit 'b047c68783aa4042b322af7af043b643d5daf09c'

* commit 'b047c68783aa4042b322af7af043b643d5daf09c':
  4xm: don't rely on get_buffer() initializing the frame.
  huffyuv: split encoder and decoder into separate files.
  lavc: make pkt_{p,d}ts doxy less confusing

Conflicts:
	libavcodec/Makefile
	libavcodec/huffyuv.c

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

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