diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-08-26 23:18:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-08-26 23:18:54 +0200 |
| commit | 094a4968188b0129d674c1369bad45a86cd0d46d (patch) | |
| tree | 372eb9e7a5dc4222b7db34c5e10ae578b536ed9b /libavcodec/mpeg4audio.h | |
| parent | 0a1cf6621067c4a85b519c8cad5c345c29017f89 (diff) | |
| parent | 1717ba0cdd587fe3463c1d8560f2c7e13fb21ba3 (diff) | |
| download | ffmpeg-094a4968188b0129d674c1369bad45a86cd0d46d.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fifo: add FIFO API test program, and fate test
fifo: add av_fifo_peek2(), and deprecate av_fifo_peek()
postprocess.c: filter name needs to be double 0 terminated
doxygen: fix wrong comment syntax, //< vs. ///<
doxygen: drop pointless star from pointer variable names
Replace deprecated av_find_stream_info() by avformat_find_stream_info().
xmv: eliminate superfluous zeroing of zero data
configure: fix typo in avconv dependency list
Conflicts:
configure
doc/APIchanges
libavutil/Makefile
libavutil/avutil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg4audio.h')
| -rw-r--r-- | libavcodec/mpeg4audio.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/mpeg4audio.h b/libavcodec/mpeg4audio.h index 174624e15d..f70049a0e8 100644 --- a/libavcodec/mpeg4audio.h +++ b/libavcodec/mpeg4audio.h @@ -31,13 +31,13 @@ typedef struct { int sampling_index; int sample_rate; int chan_config; - int sbr; //< -1 implicit, 1 presence + int sbr; ///< -1 implicit, 1 presence int ext_object_type; int ext_sampling_index; int ext_sample_rate; int ext_chan_config; int channels; - int ps; //< -1 implicit, 1 presence + int ps; ///< -1 implicit, 1 presence } MPEG4AudioConfig; extern const int ff_mpeg4audio_sample_rates[16]; |