]> git.sesse.net Git - ffmpeg/commit
projects / ffmpeg / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 23b4f35 464ccb0)
Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 30 Nov 2011 01:24:15 +0000 (02:24 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 30 Nov 2011 01:34:35 +0000 (02:34 +0100)
commitc40a35f8a7e3977c18d0ebff503a3add8ff58dad
tree889e78f2d463e5c5919533e818d781fb4fb744dctree | snapshot
parent23b4f355bbd9b8c5338fc4e31b39657073e1f88fcommit | diff
parent464ccb01447b91717cf580b870e636514701ce4fcommit | diff
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  indeo3: check per-plane data buffer against input buffer bounds.
  avconv: Handle audio sync for non-S16 sample formats.
  pthread: don't increment index on zero-sized packets.

Conflicts:
libavcodec/indeo3.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
avconv.c diff1 | diff2 | blob | history
ffmpeg.c diff1 | diff2 | blob | history
libavcodec/pthread.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.