Michael Niedermayer ab71be0912 Merge commit 'da6506c607eda585ba4b15430cf3c9a2ce09c3a9' ...

* commit 'da6506c607eda585ba4b15430cf3c9a2ce09c3a9':
  lavc: move AVCodecContext.pkt to AVCodecInternal

Conflicts:
	libavcodec/internal.h
	libavcodec/rawdec.c
	libavcodec/utils.c

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

2013-11-04 11:41:55 +01:00

28 KiB

Raw Blame History

View Raw