diff options
| author | Michael Niedermayer <[email protected]> | 2013-08-01 13:59:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-08-01 13:59:50 +0200 |
| commit | 9408d990c46c1993259058e7d70c417d1030bb10 (patch) | |
| tree | 4e5549dfaf55c4d1c791fb5949e9a4e025d0c0a3 /ffmpeg.c | |
| parent | 0f5a40c2a4bc2ae6548d75b9a9f3ef568e995883 (diff) | |
| parent | 3c8bff0740abb3785968823429e77bd41c65debf (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avframe: have av_frame_get_side_data take const AVFrame*
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'ffmpeg.c')
0 files changed, 0 insertions, 0 deletions