aboutsummaryrefslogtreecommitdiffstats
path: root/doc/formats.texi
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-04 21:48:00 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-08-04 21:48:00 +0200
commit4c8bc6fdee95af4cd7a8409dec34756350078b5e (patch)
tree06e2f17f1cf3a77a0ec5c0c4ba4e91bf90b52710 /doc/formats.texi
parent0b25261d29c6b348e2dccc2985090cf10a60c34f (diff)
parente96c3b81cadd0ba84d43b1f3a54980df3785d9a5 (diff)
downloadffmpeg-4c8bc6fdee95af4cd7a8409dec34756350078b5e.tar.gz
Merge commit 'e96c3b81cadd0ba84d43b1f3a54980df3785d9a5'
* commit 'e96c3b81cadd0ba84d43b1f3a54980df3785d9a5': avutil: rename AV_PIX_FMT_Y400A to AV_PIX_FMT_YA8 Conflicts: libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/raw.c libavutil/pixdesc.c libavutil/pixfmt.h libavutil/version.h libswscale/swscale_internal.h libswscale/swscale_unscaled.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/formats.texi')
0 files changed, 0 insertions, 0 deletions