RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
ffmpeg/tests/ref/fate/hap1

3 lines
73 B
Plaintext
Raw Normal View History

Merge commit '7ca3e5203f133eb41a0b5c3a1d753a7427ba72e7' * commit '7ca3e5203f133eb41a0b5c3a1d753a7427ba72e7': Hap decoder and encoder Conflicts: Changelog configure doc/general.texi libavcodec/allcodecs.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-22 20:33:46 +00:00
#tb 0: 62/2997
0, 0, 0, 1, 1228800, 0x0fa946bc