diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 14:14:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 14:41:13 +0100 |
| commit | 6b1ca1709fe5d66eef8292dc9f495cf3182517b4 (patch) | |
| tree | 82954a93de58b1ba71733ba21a80cb5eaa64318c /libavfilter/vf_dejudder.c | |
| parent | ad9a6e19e1a8abc0ce12ff85f9f3aaf321f16866 (diff) | |
| parent | 1481d24c3a0abf81e1d7a514547bd5305232be30 (diff) | |
| download | ffmpeg-streaming-6b1ca1709fe5d66eef8292dc9f495cf3182517b4.zip ffmpeg-streaming-6b1ca1709fe5d66eef8292dc9f495cf3182517b4.tar.gz | |
Merge commit '1481d24c3a0abf81e1d7a514547bd5305232be30'
* commit '1481d24c3a0abf81e1d7a514547bd5305232be30':
RGBA64 pixel formats
Conflicts:
doc/APIchanges
libavutil/pixdesc.c
libavutil/pixfmt.h
libavutil/version.h
libswscale/utils.c
See: 9569a3c9f41387a8c7d1ce97d8693520477a66c3
See: 92afb431621c79155fcb7171d26f137eb1bee028, as well as others
Note: the enum values added in libav are incompatible/different to what ffmpeg used since 3 years
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_dejudder.c')
0 files changed, 0 insertions, 0 deletions
