diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-23 16:12:05 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-14 11:53:39 +0100 |
| commit | 9e3e11a348e047da05415c3e7ea6720be2d78d9f (patch) | |
| tree | 2fa821199170544ea508f19537dad6c1f511c266 /libavutil/timecode.c | |
| parent | 1d20d975aa899cb5e0e5c9e9c34ce36e4f0faae3 (diff) | |
| download | ffmpeg-9e3e11a348e047da05415c3e7ea6720be2d78d9f.tar.gz | |
Merge commit '1fd2deedcc6400e08b31566a547a5fac3b38cefb'
* commit '1fd2deedcc6400e08b31566a547a5fac3b38cefb':
mlpdec: set the channel layout.
Conflicts:
libavcodec/mlpdec.c
(cherry picked from commit 1cf6f6f3daa9d9ae54a4bf0267b510e1638e272b)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/timecode.c')
0 files changed, 0 insertions, 0 deletions