aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/ass_split.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-02-10 14:17:06 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-02-10 14:17:06 +0100
commit02b3ac87f81a614120c492b9df2b294d1c54755e (patch)
tree115a08c9d644f9faf3fd60b8657cc5c3c9f173e1 /libavcodec/ass_split.c
parentf2b89f21cc3dfcfda911e621c3ea62f3175eacbe (diff)
parent813784a8bf907f6fd1d96c11e85586cee5c05695 (diff)
downloadffmpeg-02b3ac87f81a614120c492b9df2b294d1c54755e.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: sws: disable yuv2rgb warning for planar rgb. Conflicts: libswscale/yuv2rgb.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ass_split.c')
0 files changed, 0 insertions, 0 deletions