apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2025-10-12 04:01:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'b668662939de3a02454cfc9ba3e6d10b87527a40'

Browse Source 
* commit 'b668662939de3a02454cfc9ba3e6d10b87527a40':
  get_bits: Move BITSTREAM_READER_LE definition before all relevant #includes

The merge commit also includes changes for libavcodec/interplayacm.c and
libavcodec/truemotion2rt.c

Merged-by: Clément Bœsch <clement@stupeflix.com>
This commit is contained in:
Clément Bœsch
2016-06-29 11:27:33 +02:00
parent 543142990b b668662939
commit ae753dbd0d
33 changed files with 101 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/dxtory.c
View File

@@ -22,14 +22,15 @@
#include <inttypes.h>
#include "libavutil/common.h"
#include "libavutil/intreadwrite.h"
#define BITSTREAM_READER_LE
#include "avcodec.h"
#include "bytestream.h"
#include "get_bits.h"
#include "internal.h"
#include "unary.h"
#include "libavutil/common.h"
#include "libavutil/intreadwrite.h"
static int dxtory_decode_v1_rgb(AVCodecContext *avctx, AVFrame *pic,
const uint8_t *src, int src_size,