diff options
| author | Michael Niedermayer <[email protected]> | 2013-01-23 16:34:34 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-01-23 16:34:52 +0100 |
| commit | 86b892af199d420fe2bcf5f8fb96c377d924ad43 (patch) | |
| tree | e68c8748e7146c4b5ffc103fc37c4f1f6197ff22 /libavcodec/rtjpeg.c | |
| parent | 1cf6f6f3daa9d9ae54a4bf0267b510e1638e272b (diff) | |
| parent | b0c7e3ffd09f68022429920da483ad7abed84aa1 (diff) | |
Merge commit 'b0c7e3ffd09f68022429920da483ad7abed84aa1'
* commit 'b0c7e3ffd09f68022429920da483ad7abed84aa1':
mlp_parser: account for AVCodecContext.request_channels when setting the channel layout.
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavcodec/rtjpeg.c')
0 files changed, 0 insertions, 0 deletions