diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-13 17:42:49 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-13 17:42:49 +0400 |
commit | 18884f159b617208dd69fb35fa127f4fdedf5ba1 (patch) | |
tree | 2eae5d696ef3b8f8f03cb9c58ee88632ff9cc856 /tests/ref | |
parent | c55bebe2cc7bd444f83a678babc1b287aa7a3da1 (diff) | |
parent | 0a7005bebd23ade7bb852bce0401af1a8fdbb723 (diff) |
Merge commit '0a7005bebd23ade7bb852bce0401af1a8fdbb723'
* commit '0a7005bebd23ade7bb852bce0401af1a8fdbb723':
rtpdec_xiph: fix function return type
smjpeg: fix type of 'ret' variable in smjpeg_read_packet()
mpegvideo: remove write-only variable
Use proper return values in case of missing features
fate: add avstring test
rangecoder-test: Set error message log level to error, instead of debug
Conflicts:
libavcodec/aacdec.c
libavcodec/amrnbdec.c
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref')
-rw-r--r-- | tests/ref/fate/avstring | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/tests/ref/fate/avstring b/tests/ref/fate/avstring new file mode 100644 index 0000000000..bc231e8148 --- /dev/null +++ b/tests/ref/fate/avstring @@ -0,0 +1,27 @@ +Testing av_get_token() +|''| -> || + || +|| -> || + || +|:| -> || + |:| +|\| -> |\| + || +|'| -> || + || +| '' :| -> || + |:| +| '' '' :| -> | | + |:| +|foo '' :| -> |foo | + |:| +|'foo'| -> |foo| + || +|foo | -> |foo| + || +| ' foo ' | -> | foo | + || +|foo\| -> |foo\| + || +|foo': blah:blah| -> |foo: blah:blah| + || +|foo\: blah:blah| -> |foo: blah| + |:blah| +|foo'| -> |foo| + || +|'foo : ' :blahblah| -> |foo : | + |:blahblah| +|\ :blah| -> | | + |:blah| +| foo| -> |foo| + || +| foo | -> |foo| + || +| foo \ | -> |foo | + || +|foo ':blah| -> |foo :blah| + || +| foo bar : blahblah| -> |foo bar| + |: blahblah| +|\f\o\o| -> |foo| + || +|'foo : \ \ ' : blahblah| -> |foo : \ \ | + |: blahblah| +|'\fo\o:': blahblah| -> |\fo\o:| + |: blahblah| +|\'fo\o\:': foo ' :blahblah| -> |'foo:: foo | + |:blahblah| |