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)
* qatar/master:
  avframe: have av_frame_get_side_data take const AVFrame*

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

Simple merge
Simple merge