diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-27 12:38:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-27 12:38:53 +0200 |
| commit | ad207f1119d961bb83177765226ee8f3b80e369f (patch) | |
| tree | 10a72fce600d5e3f58e44cbc8eef1c6b71940618 /libavcodec/audiodsp.h | |
| parent | 127aee4ccb5e36916157e621f8bba5133f94cb75 (diff) | |
| parent | 1688eef25385089026aba55da1885f70a57815ab (diff) | |
| download | ffmpeg-ad207f1119d961bb83177765226ee8f3b80e369f.tar.gz | |
Merge commit '1688eef25385089026aba55da1885f70a57815ab'
* commit '1688eef25385089026aba55da1885f70a57815ab':
avconv: fix the muxrate values for -target
Conflicts:
ffmpeg_opt.c
No change, as ffmpegs muxrate is in bits/sec
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/audiodsp.h')
0 files changed, 0 insertions, 0 deletions