aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/lavfutils.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-11 21:05:34 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-03-11 21:05:34 +0100
commit28ee7757f5b0859510e3af6bf49fca9881f09966 (patch)
tree6b6e7ab386a73b664aac3ce21c4ee0d3dff38d4a /libavfilter/lavfutils.c
parent5171ae781a240cac3860c20f9aefc6d1b2c61cac (diff)
parentd92024f18fa3d69937cb2575f3a8bf973df02430 (diff)
downloadffmpeg-28ee7757f5b0859510e3af6bf49fca9881f09966.tar.gz
Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'
* commit 'd92024f18fa3d69937cb2575f3a8bf973df02430': lavf: more correct printf format specifiers Conflicts: libavformat/asfdec.c libavformat/cafdec.c libavformat/dxa.c libavformat/framecrcenc.c libavformat/hnm.c libavformat/iff.c libavformat/mov.c libavformat/mxfdec.c libavformat/rmdec.c libavformat/rpl.c libavformat/smacker.c libavformat/xmv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/lavfutils.c')
0 files changed, 0 insertions, 0 deletions