diff options
| author | Michael Niedermayer <[email protected]> | 2014-05-28 12:09:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-05-28 12:20:12 +0200 |
| commit | ef13967e601bb0851af04182ea2aeeea8a3025bd (patch) | |
| tree | e14f85be5ae38de983822f7461c753035cdf8778 /libavformat/segment.c | |
| parent | 8518da23f59d8f5a52f7c1c919f584a119484d0f (diff) | |
| parent | f13ffb6636fdecb5e3e0ddcff48f096e7b3db362 (diff) | |
Merge commit 'f13ffb6636fdecb5e3e0ddcff48f096e7b3db362'
* commit 'f13ffb6636fdecb5e3e0ddcff48f096e7b3db362':
flacdec: do not overwrite a channel layout set by the caller
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavformat/segment.c')
0 files changed, 0 insertions, 0 deletions