generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '7ca3e5203f133eb41a0b5c3a1d753a7427ba72e7'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer
2015-06-22 22:33:46 +02:00
parent 4df3cf90bf 7ca3e5203f
commit 55219a78c7
16 changed files with 550 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/ref/fate/hap1 Normal file
View File

@@ -0,0 +1,2 @@
#tb 0: 62/2997
0, 0, 0, 1, 1228800, 0x0fa946bc

2
tests/ref/fate/hap5 Normal file
View File

@@ -0,0 +1,2 @@
#tb 0: 1/30
0, 0, 0, 1, 1228800, 0xb71ecf93

2
tests/ref/fate/hapy Normal file
View File

@@ -0,0 +1,2 @@
#tb 0: 62/2997
0, 0, 0, 1, 1228800, 0x5993522d