aboutsummaryrefslogtreecommitdiffstats
path: root/libavdevice/fbdev_enc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-04 22:12:24 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-08-04 22:12:24 +0200
commit6017c98036078283ce3bf4069227fed13f3e0cc0 (patch)
tree3e11afe65808350d60e0aaca070d4b7bff8f45fc /libavdevice/fbdev_enc.c
parent4c8bc6fdee95af4cd7a8409dec34756350078b5e (diff)
parente9abafca278f87e1ecc6d50091d99b73ff63c9a6 (diff)
downloadffmpeg-6017c98036078283ce3bf4069227fed13f3e0cc0.tar.gz
Merge commit 'e9abafca278f87e1ecc6d50091d99b73ff63c9a6'
* commit 'e9abafca278f87e1ecc6d50091d99b73ff63c9a6': avutil: add AV_PIX_FMT_YA16 pixel format Conflicts: libavutil/pixdesc.c libavutil/pixfmt.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/fbdev_enc.c')
0 files changed, 0 insertions, 0 deletions