aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/wv.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-07-27 08:52:30 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-07-27 08:53:09 +0200
commit2fffc05f424fea8cfcd4168e64325053dab49d0d (patch)
tree024d5cbeffbf21030623aa04bf26419e7e1b35fd /libavformat/wv.c
parent8720d3ac217e508bc027060228510cef9cfb1c25 (diff)
parent779e6c2b985f2ad461a1ae704160822f97709ba7 (diff)
downloadffmpeg-2fffc05f424fea8cfcd4168e64325053dab49d0d.tar.gz
Merge commit '779e6c2b985f2ad461a1ae704160822f97709ba7'
* commit '779e6c2b985f2ad461a1ae704160822f97709ba7': lavfi: add attribute_align_arg to all public entry points Conflicts: libavfilter/buffersink.c See: af2a196e669cf7f00735a1df5889db35f3be87eb Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/wv.c')
0 files changed, 0 insertions, 0 deletions