Merge commit 'da6506c607eda585ba4b15430cf3c9a2ce09c3a9'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Nov 2013 10:41:55 +0000 (11:41 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Nov 2013 10:41:55 +0000 (11:41 +0100)
commitab71be091206a2264f3a8862215fc284bb8e6274
tree1634753965d201a33f583097660958548cce3106
parent3fc26d8073a49c96a0704015ce18f5317d87a739
parentda6506c607eda585ba4b15430cf3c9a2ce09c3a9
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>
libavcodec/avcodec.h
libavcodec/crystalhd.c
libavcodec/internal.h
libavcodec/pthread_frame.c
libavcodec/rawdec.c
libavcodec/utils.c
libavcodec/version.h