diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-23 14:54:40 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-23 15:52:39 +0100 |
| commit | fa36270c4c68589882cfeae68a037f1d191231c2 (patch) | |
| tree | 2ddefb2bbda1108755170cd97f514b75780da51a /presets/libx264-ipod640.ffpreset | |
| parent | 8102f27b5b3dff54f8099019c2df4701ac5e5d4f (diff) | |
| parent | 99ccd2ba10eac2b282c272ad9e75f082123c765a (diff) | |
| download | ffmpeg-fa36270c4c68589882cfeae68a037f1d191231c2.tar.gz | |
Merge commit '99ccd2ba10eac2b282c272ad9e75f082123c765a'
* commit '99ccd2ba10eac2b282c272ad9e75f082123c765a':
mlp: store the channel layout for each substream.
Conflicts:
libavcodec/mlp_parser.c
libavcodec/mlpdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'presets/libx264-ipod640.ffpreset')
0 files changed, 0 insertions, 0 deletions