diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-13 10:35:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-13 10:47:14 +0200 |
| commit | 1057390d916eb16d06111f7d50132f764ceb0e2e (patch) | |
| tree | da6f415fa88ffda09128af7dcd942e32c67d4562 | |
| parent | 7a48b1c49282d8386632301e77611dfbf5fd9834 (diff) | |
| parent | 46dee21a3238a5d9dfeeb1108dbad0beaa677035 (diff) | |
| download | ffmpeg-streaming-1057390d916eb16d06111f7d50132f764ceb0e2e.zip ffmpeg-streaming-1057390d916eb16d06111f7d50132f764ceb0e2e.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
png: allow encoding 16-bit grayscale
Conflicts:
libavcodec/pngenc.c
See: fdc013da7863190b9416d45830a9ad6d7fb854c2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
0 files changed, 0 insertions, 0 deletions
