diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-24 14:14:28 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-24 14:14:28 +0100 |
| commit | 198ea7a96f64b60d26068ac30605d5b50245abeb (patch) | |
| tree | f3733ea0f10027eebe49df94826e46e52e907b3d /libavcodec/avs.c | |
| parent | a77a27a24b27fc29d119b00866740e4d0b69ba28 (diff) | |
| parent | b5f536d24b5ae360503935c34d5d59fa5181b94d (diff) | |
| download | ffmpeg-streaming-198ea7a96f64b60d26068ac30605d5b50245abeb.zip ffmpeg-streaming-198ea7a96f64b60d26068ac30605d5b50245abeb.tar.gz | |
Merge commit 'b5f536d24b5ae360503935c34d5d59fa5181b94d'
* commit 'b5f536d24b5ae360503935c34d5d59fa5181b94d':
pnm: add high-bitdepth PGMYUV support for both encoder and decoder
Conflicts:
libavcodec/pnm.c
libavcodec/pnmdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/avs.c')
0 files changed, 0 insertions, 0 deletions
