diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-02-12 01:02:55 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-02-12 01:06:13 +0100 |
commit | cd1c12b5c5b79195140a93d59cbf990d034f61d8 (patch) | |
tree | 1a1ab570f0dddd706a1b995e255272c1c6f9f453 /tests/ref/seek | |
parent | 289520fd97395ffd5bf933ac80487e858bc4039d (diff) | |
parent | b498867d6691b5f1f107afd81aff403f66b434aa (diff) | |
download | ffmpeg-streaming-cd1c12b5c5b79195140a93d59cbf990d034f61d8.zip ffmpeg-streaming-cd1c12b5c5b79195140a93d59cbf990d034f61d8.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
FATE: update reference for seek-alac_mp4
sunrast: Return AVERROR values instead of -1.
sunrast: Add support for gray8 decoding.
swscale: enforce a minimum filtersize.
alacenc: use AVCodec.encode2()
alacenc: cosmetics: indentation
alacenc: consolidate bitstream writing into a single function.
alacenc: only encode frame size in header for a final smaller frame
alacenc: store current frame size in AlacEncodeContext.
alacenc: return AVERROR codes in alac_encode_frame()
alacenc: calculate a new max frame size for the final small frame
alacenc: pretty-printing and other cosmetics
alacenc: fix error handling and potential memleaks in alac_encode_init()
alacenc: do not set coded_frame->key_frame
alacenc: do not set bits_per_coded_sample
alacenc: remove unneeded frame_size check in alac_encode_frame()
tta: error out if samplerate is zero.
ttadec: fix invalid free when an error occurs while decoding 24-bit tta
wavpack: add needed braces for 2 statements inside an if block
Conflicts:
tests/ref/acodec/alac
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/seek')
-rw-r--r-- | tests/ref/seek/alac_m4a | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/tests/ref/seek/alac_m4a b/tests/ref/seek/alac_m4a index 892cfb5..51e23e1 100644 --- a/tests/ref/seek/alac_m4a +++ b/tests/ref/seek/alac_m4a @@ -1,53 +1,53 @@ -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 40 size: 3240 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 40 size: 3236 ret: 0 st:-1 flags:0 ts:-1.000000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 40 size: 3240 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 40 size: 3236 ret: 0 st:-1 flags:1 ts: 1.894167 -ret: 0 st: 0 flags:1 dts: 1.857596 pts: 1.857596 pos: 73731 size: 4965 +ret: 0 st: 0 flags:1 dts: 1.857596 pts: 1.857596 pos: 73651 size: 4961 ret: 0 st: 0 flags:0 ts: 0.788345 -ret: 0 st: 0 flags:1 dts: 0.835918 pts: 0.835918 pos: 29072 size: 3198 +ret: 0 st: 0 flags:1 dts: 0.835918 pts: 0.835918 pos: 29036 size: 3194 ret: 0 st: 0 flags:1 ts:-0.317506 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 40 size: 3240 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 40 size: 3236 ret: 0 st:-1 flags:0 ts: 2.576668 -ret: 0 st: 0 flags:1 dts: 2.600635 pts: 2.600635 pos: 137669 size: 12847 +ret: 0 st: 0 flags:1 dts: 2.600635 pts: 2.600635 pos: 137557 size: 12843 ret: 0 st:-1 flags:1 ts: 1.470835 -ret: 0 st: 0 flags:1 dts: 1.393197 pts: 1.393197 pos: 50219 size: 4418 +ret: 0 st: 0 flags:1 dts: 1.393197 pts: 1.393197 pos: 50159 size: 4414 ret: 0 st: 0 flags:0 ts: 0.365011 -ret: 0 st: 0 flags:1 dts: 0.371519 pts: 0.371519 pos: 12962 size: 3213 +ret: 0 st: 0 flags:1 dts: 0.371519 pts: 0.371519 pos: 12946 size: 3209 ret: 0 st: 0 flags:1 ts:-0.740839 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 40 size: 3240 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 40 size: 3236 ret: 0 st:-1 flags:0 ts: 2.153336 -ret: 0 st: 0 flags:1 dts: 2.229116 pts: 2.229116 pos: 101031 size: 7900 +ret: 0 st: 0 flags:1 dts: 2.229116 pts: 2.229116 pos: 100935 size: 7896 ret: 0 st:-1 flags:1 ts: 1.047503 -ret: 0 st: 0 flags:1 dts: 1.021678 pts: 1.021678 pos: 35362 size: 3035 +ret: 0 st: 0 flags:1 dts: 1.021678 pts: 1.021678 pos: 35318 size: 3031 ret: 0 st: 0 flags:0 ts:-0.058322 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 40 size: 3240 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 40 size: 3236 ret: 0 st: 0 flags:1 ts: 2.835828 -ret: 0 st: 0 flags:1 dts: 2.786395 pts: 2.786395 pos: 163300 size: 12769 +ret: 0 st: 0 flags:1 dts: 2.786395 pts: 2.786395 pos: 163180 size: 12765 ret: 0 st:-1 flags:0 ts: 1.730004 -ret: 0 st: 0 flags:1 dts: 1.764717 pts: 1.764717 pos: 68756 size: 4975 +ret: 0 st: 0 flags:1 dts: 1.764717 pts: 1.764717 pos: 68680 size: 4971 ret: 0 st:-1 flags:1 ts: 0.624171 -ret: 0 st: 0 flags:1 dts: 0.557279 pts: 0.557279 pos: 19365 size: 3238 +ret: 0 st: 0 flags:1 dts: 0.557279 pts: 0.557279 pos: 19341 size: 3234 ret: 0 st: 0 flags:0 ts:-0.481655 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 40 size: 3240 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 40 size: 3236 ret: 0 st: 0 flags:1 ts: 2.412494 -ret: 0 st: 0 flags:1 dts: 2.321995 pts: 2.321995 pos: 108931 size: 7890 +ret: 0 st: 0 flags:1 dts: 2.321995 pts: 2.321995 pos: 108831 size: 7886 ret: 0 st:-1 flags:0 ts: 1.306672 -ret: 0 st: 0 flags:1 dts: 1.393197 pts: 1.393197 pos: 50219 size: 4418 +ret: 0 st: 0 flags:1 dts: 1.393197 pts: 1.393197 pos: 50159 size: 4414 ret: 0 st:-1 flags:1 ts: 0.200839 -ret: 0 st: 0 flags:1 dts: 0.185760 pts: 0.185760 pos: 6478 size: 3249 +ret: 0 st: 0 flags:1 dts: 0.185760 pts: 0.185760 pos: 6470 size: 3245 ret: 0 st: 0 flags:0 ts:-0.904989 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 40 size: 3240 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 40 size: 3236 ret: 0 st: 0 flags:1 ts: 1.989184 -ret: 0 st: 0 flags:1 dts: 1.950476 pts: 1.950476 pos: 78696 size: 6518 +ret: 0 st: 0 flags:1 dts: 1.950476 pts: 1.950476 pos: 78612 size: 6514 ret: 0 st:-1 flags:0 ts: 0.883340 -ret: 0 st: 0 flags:1 dts: 0.928798 pts: 0.928798 pos: 32270 size: 3092 +ret: 0 st: 0 flags:1 dts: 0.928798 pts: 0.928798 pos: 32230 size: 3088 ret: 0 st:-1 flags:1 ts:-0.222493 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 40 size: 3240 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 40 size: 3236 ret: 0 st: 0 flags:0 ts: 2.671678 -ret: 0 st: 0 flags:1 dts: 2.693515 pts: 2.693515 pos: 150516 size: 12784 +ret: 0 st: 0 flags:1 dts: 2.693515 pts: 2.693515 pos: 150400 size: 12780 ret: 0 st: 0 flags:1 ts: 1.565850 -ret: 0 st: 0 flags:1 dts: 1.486077 pts: 1.486077 pos: 54637 size: 4558 +ret: 0 st: 0 flags:1 dts: 1.486077 pts: 1.486077 pos: 54573 size: 4554 ret: 0 st:-1 flags:0 ts: 0.460008 -ret: 0 st: 0 flags:1 dts: 0.464399 pts: 0.464399 pos: 16175 size: 3190 +ret: 0 st: 0 flags:1 dts: 0.464399 pts: 0.464399 pos: 16155 size: 3186 ret: 0 st:-1 flags:1 ts:-0.645825 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 40 size: 3240 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 40 size: 3236 |