Merge commit 'dd2d3b766b20196d0b65a82e3d897ccecbf7adb8'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 11 May 2014 22:21:44 +0000 (00:21 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 11 May 2014 22:21:44 +0000 (00:21 +0200)
commit2ec4586d77c18eff38c128936a67b7d7a2e7f9a0
tree376a5dc29dc6421c52dc395aef14ee6429f1eb68
parentc4fe50b954a0490c54efca19682cfae00eba3145
parentdd2d3b766b20196d0b65a82e3d897ccecbf7adb8
Merge commit 'dd2d3b766b20196d0b65a82e3d897ccecbf7adb8'

* commit 'dd2d3b766b20196d0b65a82e3d897ccecbf7adb8':
  lavc: Add hwaccel private data and init/uninit callbacks

Conflicts:
libavcodec/avcodec.h
libavcodec/internal.h
libavcodec/pthread_frame.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/avcodec.h
libavcodec/internal.h
libavcodec/pthread_frame.c
libavcodec/utils.c