diff options
| author | Michael Niedermayer <[email protected]> | 2014-01-05 22:27:34 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-01-05 22:27:34 +0100 |
| commit | bc7f76377c1e8850af163646a98ab086a84f5d66 (patch) | |
| tree | e9601aa8be8325fc6fed43a0e479bdb3621f4aaa /libavformat/rtpenc_xiph.c | |
| parent | 4cf4da9dc5814aebe8881d93b4a88f593b774448 (diff) | |
| parent | 6bfdb2de881372048be7fbda643417e1fd3ce93c (diff) | |
Merge commit '6bfdb2de881372048be7fbda643417e1fd3ce93c'
* commit '6bfdb2de881372048be7fbda643417e1fd3ce93c':
dcadec: set the output channel mode more accurately.
Conflicts:
libavcodec/dcadec.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavformat/rtpenc_xiph.c')
0 files changed, 0 insertions, 0 deletions