diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-01 13:35:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-01 13:39:31 +0200 |
| commit | 0ccfcb0638be99d1fc2c2c1dea6850b3b257ae01 (patch) | |
| tree | 704e2d18e4ba8862bd143cd625f4f605ac550727 /libavcodec/wmavoice_data.h | |
| parent | 6e8e9f1e517ee52fe439f3e8ca762f09d235f21e (diff) | |
| parent | eb800f120d2d42590fde2302fe828c847e41e773 (diff) | |
| download | ffmpeg-0ccfcb0638be99d1fc2c2c1dea6850b3b257ae01.tar.gz | |
Merge commit 'eb800f120d2d42590fde2302fe828c847e41e773'
* commit 'eb800f120d2d42590fde2302fe828c847e41e773':
libavcodec: set AVFrame colorspace fields on decoding
Conflicts:
libavcodec/utils.c
See: a80e622924c89df69fb1c225ba432fe12fe6648e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wmavoice_data.h')
0 files changed, 0 insertions, 0 deletions