diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-23 14:54:40 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-14 11:52:23 +0100 |
| commit | e67491a2a49aba7675e87713a3c9751ece14386e (patch) | |
| tree | fee69cda8c005425d9f901a2dd8685d66f91ae17 /libavutil/timecode.c | |
| parent | e1a86b1433f1ea39a1197b2353afad8e88e51009 (diff) | |
| download | ffmpeg-e67491a2a49aba7675e87713a3c9751ece14386e.tar.gz | |
Merge commit '99ccd2ba10eac2b282c272ad9e75f082123c765a'
* commit '99ccd2ba10eac2b282c272ad9e75f082123c765a':
mlp: store the channel layout for each substream.
Conflicts:
libavcodec/mlp_parser.c
libavcodec/mlpdec.c
(cherry picked from commit fa36270c4c68589882cfeae68a037f1d191231c2)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/timecode.c')
0 files changed, 0 insertions, 0 deletions