OSDN Git Service

(root) / android-x86 / external-ffmpeg.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f357ef2 797f2a7)
Merge commit '797f2a791397210ec1b591b326658805c5dbf104'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 14 Dec 2013 21:15:10 +0000 (22:15 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 14 Dec 2013 21:17:17 +0000 (22:17 +0100)
commit6659364d3a4778b37421e35c10d9205343f0fa8d
tree41fd955f6d2c6b6dee7ce660313b8f6dd9d923c4tree | snapshot
parentf357ef2e0ce189955f1a7681ae658432efeb17b3commit | diff
parent797f2a791397210ec1b591b326658805c5dbf104commit | diff
Merge commit '797f2a791397210ec1b591b326658805c5dbf104'

* commit '797f2a791397210ec1b591b326658805c5dbf104':
  hdsenc: Check the init_file() return code
  hdsenc: Fix an off by one error in an array size check
  hdsenc: Avoid integer overflow

Conflicts:
libavformat/hdsenc.c

See: 572965c9a6b8173d918dea392aadfee1d44d7f47
See: 3dbf9afe857d480993786bea0ede9dd9526776d2
See: 6722e564a82bac471d92b02550b5017c09b539ba
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/hdsenc.c diff1 | diff2 | blob | history
external/ffmpeg
About OSDN
Find Software
Develop Software
Help