eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-23 07:20:05 +01: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

3
libavcodec/msgsmdec.c
View File

@@ -21,8 +21,9 @@
#define BITSTREAM_READER_LE
#include "avcodec.h"
#include "msgsmdec.h"
#include "gsm.h"
#include "msgsmdec.h"
#include "gsmdec_template.c"
int ff_msgsm_decode_block(AVCodecContext *avctx, int16_t *samples,