Michael Niedermayer def18e5470 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@gmx.at>

2012-12-23 14:53:21 +01:00

23 KiB

Raw Blame History

View Raw