ffmpeg | branch: master | Michael Niedermayer <mich...@niedermayer.cc> | Tue
Jul 28 00:04:02 2015 +0200| [146730480265dc2ce23f18a15b9edf2129b54185] |
committer: Michael Niedermayer
Merge commit 'abdc7e403e003e97a0dcc4499ac319bf854aeead'
* commit 'abdc7e403e003e97a0dcc4499ac319bf854aeead':
fate: Add hap-chunk ref file
Conflicts:
tests/ref/fate/hap-chunk
See: c7e6443441ed5c1b5f64067dfbf4956bc2c6acbb
Merged-by: Michael Niedermayer <mich...@niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=146730480265dc2ce23f18a15b9edf2129b54185
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
