generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  put_bits: Remove unused includes

Conflicts:
	libavcodec/put_bits.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-03-04 14:12:26 +01:00
parent 8cc581fbf7 973dc4e8d4
commit efc4439c89
10 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/s302menc.c
View File

@@ -22,6 +22,7 @@
#include "avcodec.h"
#include "internal.h"
#include "mathops.h"
#include "put_bits.h"
#define AES3_HEADER_LEN 4