diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-08 21:02:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-08 21:04:30 +0100 |
| commit | 879ea06bc5572a739712d0b5e291f1b04bf16e33 (patch) | |
| tree | a30f3fcc46e2ef9e8de855a99f59967c4eb2c153 /libavcodec/movtextenc.c | |
| parent | c9128c2c8318a087365cd2d6de1f500b43bfc684 (diff) | |
| parent | 90411b333d6b6bb69d8937117b9250785730dc53 (diff) | |
| download | ffmpeg-879ea06bc5572a739712d0b5e291f1b04bf16e33.tar.gz | |
Merge commit '90411b333d6b6bb69d8937117b9250785730dc53'
* commit '90411b333d6b6bb69d8937117b9250785730dc53':
Allow reading of growing avi files (currently being written)
Conflicts:
libavformat/avidec.c
tests/ref/fate/cvid-partial
See: e42a3dd123c47efd7921f93d4a1f6f53c196ad4a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/movtextenc.c')
0 files changed, 0 insertions, 0 deletions