diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-27 23:47:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-27 23:53:55 +0200 |
| commit | 4be1b6bef09737cef8173b619132fa13bef80818 (patch) | |
| tree | 649170b922ae4641f2519d9645db950d1a9256d2 /libavcodec | |
| parent | f01e3c5d000d264b2935e186594a37a3c00f9465 (diff) | |
| parent | 3ee217853a6741b829a2683f49c590618891b1ab (diff) | |
| download | ffmpeg-4be1b6bef09737cef8173b619132fa13bef80818.tar.gz | |
Merge commit '3ee217853a6741b829a2683f49c590618891b1ab'
* commit '3ee217853a6741b829a2683f49c590618891b1ab':
Support the Hap chunked frame format
Conflicts:
libavcodec/hap.h
libavcodec/hapdec.c
libavcodec/version.h
See: c7e6443441ed5c1b5f64067dfbf4956bc2c6acbb
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/hap.h | 1 | ||||
| -rw-r--r-- | libavcodec/hapdec.c | 3 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/hap.h b/libavcodec/hap.h index e334ba837e..e4762ee438 100644 --- a/libavcodec/hap.h +++ b/libavcodec/hap.h @@ -89,6 +89,7 @@ typedef struct HapContext { * - any other error occurs */ int ff_hap_set_chunk_count(HapContext *ctx, int count, int first_in_frame); + /* * Free resources associated with the context */ diff --git a/libavcodec/hapdec.c b/libavcodec/hapdec.c index e2713fcc69..3f036fd690 100644 --- a/libavcodec/hapdec.c +++ b/libavcodec/hapdec.c @@ -37,10 +37,10 @@ #include "bytestream.h" #include "hap.h" #include "internal.h" +#include "memory.h" #include "snappy.h" #include "texturedsp.h" #include "thread.h" -#include "memory.h" /* The first three bytes are the size of the section past the header, or zero * if the length is stored in the next long word. The fourth byte in the first @@ -252,6 +252,7 @@ static int decompress_chunks_thread(AVCodecContext *avctx, void *arg, if (chunk->compressor == HAP_COMP_SNAPPY) { int ret; int64_t uncompressed_size = ctx->tex_size; + /* Uncompress the frame */ ret = ff_snappy_uncompress(&gbc, dst, &uncompressed_size); if (ret < 0) { diff --git a/libavcodec/version.h b/libavcodec/version.h index 71032a5c99..c6efd03efe 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #define LIBAVCODEC_VERSION_MAJOR 56 #define LIBAVCODEC_VERSION_MINOR 56 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |