diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-08 11:41:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-08 11:41:29 +0100 |
| commit | 9ebfe38f3873eafacff9b0933cbf9b97198ec020 (patch) | |
| tree | f0d3972ac8c353dcf30838ad420e9daf03da8b98 /ffserver_config.h | |
| parent | 4342b346d273366438f10a1cc665d0c2db2af469 (diff) | |
| parent | 9a5ac36b69ede4563e9ecd734141b12ea3280fbc (diff) | |
| download | ffmpeg-9ebfe38f3873eafacff9b0933cbf9b97198ec020.tar.gz | |
Merge commit '9a5ac36b69ede4563e9ecd734141b12ea3280fbc'
* commit '9a5ac36b69ede4563e9ecd734141b12ea3280fbc':
movenc: Require samples before trying to write edts
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffserver_config.h')
0 files changed, 0 insertions, 0 deletions