eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-24 07:50:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '7f9f771eac0d37a632e0ed9bd89961d57fcfb7e0'

Browse Source 
* commit '7f9f771eac0d37a632e0ed9bd89961d57fcfb7e0':
  avcodec: Don't anonymously typedef structs

Conflicts:
	libavcodec/alac.c
	libavcodec/cinepak.c
	libavcodec/cscd.c
	libavcodec/dcadec.c
	libavcodec/g723_1.c
	libavcodec/gif.c
	libavcodec/iff.c
	libavcodec/kgv1dec.c
	libavcodec/libopenjpegenc.c
	libavcodec/libspeexenc.c
	libavcodec/ra288.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-02-14 21:18:17 +01:00
parent a0fe1a25fa 7f9f771eac
commit a94eba6f0c
51 changed files with 79 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/sipr.c
View File

@@ -44,7 +44,7 @@
#include "sipr.h"
#include "siprdata.h"
typedef struct {
typedef struct SiprModeParam {
const char *mode_name;
uint16_t bits_per_frame;
uint8_t subframe_count;