Mercurial > libavformat.hg
comparison matroskadec.c @ 4349:96dba41bad7f libavformat
Add av_ prefix to LZO stuff and thus make it officially part of the public API.
Keep lzo1x_decode until the next major version bump for binary compatibility.
| author | reimar |
|---|---|
| date | Mon, 02 Feb 2009 20:16:00 +0000 |
| parents | 49c1d3b27727 |
| children | 817bef131f7f |
comparison
equal
deleted
inserted
replaced
| 4348:1ce2aaf9c918 | 4349:96dba41bad7f |
|---|---|
| 870 return encodings[0].compression.settings.size; | 870 return encodings[0].compression.settings.size; |
| 871 case MATROSKA_TRACK_ENCODING_COMP_LZO: | 871 case MATROSKA_TRACK_ENCODING_COMP_LZO: |
| 872 do { | 872 do { |
| 873 olen = pkt_size *= 3; | 873 olen = pkt_size *= 3; |
| 874 pkt_data = av_realloc(pkt_data, | 874 pkt_data = av_realloc(pkt_data, |
| 875 pkt_size+LZO_OUTPUT_PADDING); | 875 pkt_size+AV_LZO_OUTPUT_PADDING); |
| 876 result = lzo1x_decode(pkt_data, &olen, data, &isize); | 876 result = av_lzo1x_decode(pkt_data, &olen, data, &isize); |
| 877 } while (result==LZO_OUTPUT_FULL && pkt_size<10000000); | 877 } while (result==AV_LZO_OUTPUT_FULL && pkt_size<10000000); |
| 878 if (result) | 878 if (result) |
| 879 goto failed; | 879 goto failed; |
| 880 pkt_size -= olen; | 880 pkt_size -= olen; |
| 881 break; | 881 break; |
| 882 #if CONFIG_ZLIB | 882 #if CONFIG_ZLIB |