diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-06 22:39:18 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-06 22:50:06 +0100 |
| commit | 3ce858141309c09294177e63d9a36cd0924dc200 (patch) | |
| tree | 5291181945897071a3fa0117e0ad5c878f6af03c /doc/examples/scaling_video.c | |
| parent | 2265212396c1126ee4b21cc038a2bc7eab16e60a (diff) | |
| parent | 5b930092c3afd2ae01f1c8aa7fb405911d6ad416 (diff) | |
| download | ffmpeg-3ce858141309c09294177e63d9a36cd0924dc200.tar.gz | |
Merge commit '5b930092c3afd2ae01f1c8aa7fb405911d6ad416'
* commit '5b930092c3afd2ae01f1c8aa7fb405911d6ad416':
mxf: Set audio packets pts
Conflicts:
libavformat/mxfdec.c
See: 83cab07a4c7f8ee1521c49e387b7d86de78d1955
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/examples/scaling_video.c')
0 files changed, 0 insertions, 0 deletions