diff options
| author | Michael Niedermayer <[email protected]> | 2014-02-02 05:05:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-02-02 05:07:42 +0100 |
| commit | 8fb67c102655dd4de08d99176039d7a404540b06 (patch) | |
| tree | 4d6fa0c64ddea5c161e05696031d1c0e07b0b37d /doc/examples/muxing.c | |
| parent | 549f052239d9a63d3094df5a6d53448d5282cf24 (diff) | |
| parent | 7d56f2fffc14ad02001ee0689bee76a759da9ede (diff) | |
Merge commit '7d56f2fffc14ad02001ee0689bee76a759da9ede'
* commit '7d56f2fffc14ad02001ee0689bee76a759da9ede':
mxf: Handle negative edit_rate
Conflicts:
libavformat/mxfdec.c
See: 83cab07a4c7f8ee1521c49e387b7d86de78d1955
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'doc/examples/muxing.c')
0 files changed, 0 insertions, 0 deletions