aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/samplefmt.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-08-08 11:18:17 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-08-08 11:18:17 +0200
commit579a137897993e474af08499bd4c2ae62f4e9880 (patch)
tree7ff32820367148a5b85af24f119608753233f80d /libavutil/samplefmt.c
parent87e8cbf70931b789efc04c978082fc5181a51a26 (diff)
parent880391ed2d2faf796ca3a16f63cec69767546a21 (diff)
downloadffmpeg-579a137897993e474af08499bd4c2ae62f4e9880.tar.gz
Merge commit '880391ed2d2faf796ca3a16f63cec69767546a21'
* commit '880391ed2d2faf796ca3a16f63cec69767546a21': libavutil: use avpriv_open() Conflicts: libavutil/random_seed.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/samplefmt.c')
0 files changed, 0 insertions, 0 deletions