aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/g729.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-10-27 19:46:53 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-10-27 19:46:53 +0200
commitc2553a5585c381971eca55e9e008cf4caee919fe (patch)
tree3237cc56e93a5d7f0e6dab69c20916f2d69d51aa /libavcodec/g729.h
parent4ffed61b4938d9a3371ca9d4af0be578546a4ae0 (diff)
parent94619d5e55f6142392227b855f0bff95b8e0e944 (diff)
downloadffmpeg-c2553a5585c381971eca55e9e008cf4caee919fe.tar.gz
Merge remote-tracking branch 'luzero/pulse'
* luzero/pulse: pulse: set the device from the avformat filename Conflicts: libavdevice/pulse.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/g729.h')
0 files changed, 0 insertions, 0 deletions