Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 1 Aug 2013 11:59:47 +0000 (13:59 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 1 Aug 2013 11:59:50 +0000 (13:59 +0200)
commit9408d990c46c1993259058e7d70c417d1030bb10
tree4e5549dfaf55c4d1c791fb5949e9a4e025d0c0a3
parent0f5a40c2a4bc2ae6548d75b9a9f3ef568e995883
parent3c8bff0740abb3785968823429e77bd41c65debf
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avframe: have av_frame_get_side_data take const AVFrame*

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/frame.c
libavutil/frame.h