[FFmpeg-cvslog] Merge commit '90411b333d6b6bb69d8937117b9250785730dc53'

Michael Niedermayer git at videolan.org
Mon Dec 8 21:13:45 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Dec  8 21:02:42 2014 +0100| [879ea06bc5572a739712d0b5e291f1b04bf16e33] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=879ea06bc5572a739712d0b5e291f1b04bf16e33
---





More information about the ffmpeg-cvslog mailing list