ffmpeg | branch: master | Michael Niedermayer <mich...@niedermayer.cc> | Thu
Jul 23 12:35:10 2015 +0200| [b04b021005508e190ad02b66106c2c611b404a72] |
committer: Michael Niedermayer
Merge commit 'ae5a8dca675ee544178225256893e679b750cb63'
* commit 'ae5a8dca675ee544178225256893e679b750cb63':
hap: Fix slice size computation
Conflicts:
libavcodec/hapdec.c
Merged-by: Michael Niedermayer <mich...@niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b04b021005508e190ad02b66106c2c611b404a72
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
