aboutsummaryrefslogtreecommitdiffstats
path: root/ffserver.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-10-29 10:21:23 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-10-29 10:21:23 +0100
commit6bf4edec27de00adac4119a7b8df04d6c0504843 (patch)
treeb7218a9908957df093a9baa51a01801070e77777 /ffserver.c
parentf1f0b01c4700ae342bb245efcc00a724fd270c14 (diff)
parentc9a13a289d0e1607387854127476813a1ee3d34b (diff)
downloadffmpeg-6bf4edec27de00adac4119a7b8df04d6c0504843.tar.gz
Merge commit 'c9a13a289d0e1607387854127476813a1ee3d34b'
* commit 'c9a13a289d0e1607387854127476813a1ee3d34b': lavc: remove old unused audio conversion functions. Conflicts: libavcodec/audioconvert.c libavcodec/audioconvert.h Merge only for metadata. keeping the old API longer reduces the need for applications to be continuously updated. Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffserver.c')
0 files changed, 0 insertions, 0 deletions