falkTX
/
FFmpeg
mirror of https://github.com/falkTX/FFmpeg.git
1
0
Fork 0
Code Issues 0 Releases 338 Wiki Activity
Browse Source

Merge commit '7d65e960c72f36b73ae7fe84f8e427d758e61da9' 

* commit '7d65e960c72f36b73ae7fe84f8e427d758e61da9':
  iff: Do not read over the source buffer

Conflicts:
	libavcodec/iff.c

See: 2fbb37b51b

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.1
Michael Niedermayer 12 years ago
parent
56090b5b80 7d65e960c7
commit
2efc2b53be
Unified View
Diff Options
Show Stats Download Patch File Download Diff File

Diff Content Not Available