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

Merge commit '6656370b858329ca07a60a2de954d5e90daa0206'

Browse Source 
* commit '6656370b858329ca07a60a2de954d5e90daa0206':
  avconv: set the "encoder" tag when transcoding

Conflicts:
	ffmpeg.c
	tests/ref/lavf/mkv
	tests/ref/seek/lavf-mkv

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-05-18 21:26:29 +02:00
parent c01bcce495 6656370b85
commit 1e49439f04
71 changed files with 1729 additions and 1680 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/ref/acodec/pcm-s8_planar
View File

@@ -1,4 +1,4 @@
ce99d95295ade9945849ef7c1de8c4ca *tests/data/fate/acodec-pcm-s8_planar.nut
531054 tests/data/fate/acodec-pcm-s8_planar.nut
c7b1faf9beb97c8417edb6a8ddc76904 *tests/data/fate/acodec-pcm-s8_planar.nut
531095 tests/data/fate/acodec-pcm-s8_planar.nut
652edf30f35ad89bf27bcc9d2f9c7b53 *tests/data/fate/acodec-pcm-s8_planar.out.wav
stddev: 147.89 PSNR: 52.93 MAXDIFF: 255 bytes: 1058400/ 1058400