diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-25 04:57:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-25 04:57:48 +0200 |
| commit | eeb9242b623c76bdda0ef842cf95d3dc03ca3b60 (patch) | |
| tree | 25319e951aded067c9ed6845c54a43c66945d2af /libavformat/flvenc.c | |
| parent | 48579041bae5e19177b0d09e3b9cfcfc33d440d8 (diff) | |
| parent | 50dbe6b3544fa64d5611e16553bf542fd71276b8 (diff) | |
| download | ffmpeg-eeb9242b623c76bdda0ef842cf95d3dc03ca3b60.tar.gz | |
Merge commit '50dbe6b3544fa64d5611e16553bf542fd71276b8'
* commit '50dbe6b3544fa64d5611e16553bf542fd71276b8':
mov: fix assigment check
Conflicts:
libavformat/mov.c
See: af2e5061bbcabf5eae780929fa25784b6127759e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/flvenc.c')
0 files changed, 0 insertions, 0 deletions