ffmpeg/pcm-u16be at 1e49439f04f4aeb45344e8753094d00ac4b1a5d6 - ffmpeg - Atria-soft GIT

generic-library/ffmpeg

Michael Niedermayer 1e49439f04 Merge commit '6656370b858329ca07a60a2de954d5e90daa0206'

* 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>

2014-05-18 21:31:51 +02:00

5 lines

259 B

Plaintext

Raw Blame History

 c8429e13c6c438bb91db7b27323a *tests/data/fate/acodec-pcm-u16be.nut
 1060710 tests/data/fate/acodec-pcm-u16be.nut
 e54b261530a1bcf6de6fe3b21dc5f6 *tests/data/fate/acodec-pcm-u16be.out.wav
 stddev:    0.00 PSNR:999.99 MAXDIFF:    0 bytes:  1058400/  1058400