diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-12 17:21:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-12 17:21:01 +0200 |
| commit | 27ccc82e1bb1b97a85e5fb33b92082267078b4d1 (patch) | |
| tree | 6dbdea647635c92e397cf37407540070453340c5 /LICENSE | |
| parent | 13afee951a49964abb6d3e2d11644ac9d5ded2c7 (diff) | |
| parent | 22c8cbc0da8be2ba80190d42d381f63da389734f (diff) | |
| download | ffmpeg-27ccc82e1bb1b97a85e5fb33b92082267078b4d1.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavu,lavd: do not use av_pix_fmt_descriptors directly.
Conflicts:
libavutil/imgutils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'LICENSE')
0 files changed, 0 insertions, 0 deletions