aboutsummaryrefslogtreecommitdiffstats
path: root/libpostproc/postprocess_internal.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-12-04 01:02:37 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-12-04 01:02:37 +0100
commit7f92f3d8129f44bc2ed935e9d81735ffdcd9921f (patch)
tree1b56b42bedce2ed6b28e629055be671be027e7b5 /libpostproc/postprocess_internal.h
parentff53c79d0aefcef91e0a57125aeaffa08b326e56 (diff)
parentadedd840e20cbcf6b23b41d415581dc03bcce4c6 (diff)
downloadffmpeg-7f92f3d8129f44bc2ed935e9d81735ffdcd9921f.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: h264: fix frame reordering code. fate: Add a test for the VBLE decoder doc: break some long lines in developer.texi drawtext: make x and y parametric drawtext: manage memory allocation better drawtext: refactor draw_text doc: remove space between variable and post increment in example code Conflicts: doc/developer.texi doc/filters.texi libavcodec/h264.c libavfilter/vf_drawtext.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libpostproc/postprocess_internal.h')
0 files changed, 0 insertions, 0 deletions