diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-10-02 23:53:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-02 23:53:33 +0200 |
| commit | 57fa2fc69ff480b4cabf3d7c0c28435c2cde6594 (patch) | |
| tree | 2f8b4965690d0e32fb0cbbe2497bc7f06439ebad /libavcodec/mpc7.c | |
| parent | 3ebab62fc67591fd9313fad32892d7d32e805422 (diff) | |
| parent | 1dd3c473a2096e60b2e5a765eaabb378c34b3537 (diff) | |
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: use libswresample instead of av_audio_convert
audioconvert: add av_get_default_channel_layout public function
ffplay: use avctx->channels and avctx->freq before avcodec_open2 consistently
ffplay: remove now unnecessary request_channels, we set it now with options
ffplay: set request_channels to 2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpc7.c')
0 files changed, 0 insertions, 0 deletions