summaryrefslogtreecommitdiffstats
path: root/libavresample
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-01-04 13:29:09 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-01-04 13:29:15 +0100
commita08194b4c51ebc7024f50eed0f09aa74058e15bb (patch)
tree1716b42c83f77e09dd934d3d4fd58e784e8e547a /libavresample
parent8d0b2aae71f01904e4a7ac0e8795592da5a0bd89 (diff)
parentbe6cde3ce86e9ecf9b52309d7ca68c410ced525d (diff)
downloadffmpeg-streaming-a08194b4c51ebc7024f50eed0f09aa74058e15bb.zip
ffmpeg-streaming-a08194b4c51ebc7024f50eed0f09aa74058e15bb.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: lavr: fix missing " in header documentation aviobuf: Discard old buffered, previously read data in ffio_read_partial Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample')
-rw-r--r--libavresample/avresample.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavresample/avresample.h b/libavresample/avresample.h
index 34998aa..0012787 100644
--- a/libavresample/avresample.h
+++ b/libavresample/avresample.h
@@ -49,7 +49,7 @@
* av_opt_set_int(avr, "in_sample_rate", 48000, 0);
* av_opt_set_int(avr, "out_sample_rate", 44100, 0);
* av_opt_set_int(avr, "in_sample_fmt", AV_SAMPLE_FMT_FLTP, 0);
- * av_opt_set_int(avr, "out_sample_fmt, AV_SAMPLE_FMT_S16, 0);
+ * av_opt_set_int(avr, "out_sample_fmt", AV_SAMPLE_FMT_S16, 0);
* @endcode
*
* Once the context is initialized, it must be opened with avresample_open(). If
OpenPOWER on IntegriCloud