wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge commit 'c35f0e8495'

Browse source 
* commit 'c35f0e8495':
  au: Reorder code so that both muxer and demuxer are under #ifdefs
  fate: Move RALF test into lossless audio group
  cosmetics: Use consistent names for multiple inclusion guards.

Conflicts:
	libavformat/au.c
	tests/fate/lossless-audio.mak
	tests/fate/real.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-12-18 14:27:59 +01:00
commit 94ecbe23c5
6 changed files with 71 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libavcodec/gsmdec_data.h
View file

@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef AVCODEC_GSMDEC_DATA
#define AVCODEC_GSMDEC_DATA
#ifndef AVCODEC_GSMDEC_DATA_H
#define AVCODEC_GSMDEC_DATA_H
#include <stdint.h>
#include "avcodec.h"
@ -41,4 +41,4 @@ typedef struct GSMContext {
extern const uint16_t ff_gsm_long_term_gain_tab[4];
extern const int16_t ff_gsm_dequant_tab[64][8];
#endif /* AVCODEC_GSMDEC_DATA */
#endif /* AVCODEC_GSMDEC_DATA_H */

6
libavcodec/options_table.h
View file

@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef AVCODEC_OPTIONS_TABLE
#define AVCODEC_OPTIONS_TABLE
#ifndef AVCODEC_OPTIONS_TABLE_H
#define AVCODEC_OPTIONS_TABLE_H
#include <float.h>
#include <limits.h>
@ -414,4 +414,4 @@ static const AVOption options[]={
#undef DEFAULT
#undef OFFSET
#endif // AVCODEC_OPTIONS_TABLE
#endif /* AVCODEC_OPTIONS_TABLE_H */