virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-29 05:57:37 +02:00
Code Issues Releases Activity

Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'

Browse Source 
* commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e':
  avformat: Don't anonymously typedef structs

Conflicts:
	libavformat/adtsenc.c
	libavformat/aiffenc.c
	libavformat/avidec.c
	libavformat/gif.c
	libavformat/iff.c
	libavformat/img2dec.c
	libavformat/jvdec.c
	libavformat/matroskadec.c
	libavformat/udp.c
	libavformat/wtvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-02-14 21:07:40 +01:00
parent 4ab7eb0da2 daf8cf358a
commit a0fe1a25fa
65 changed files with 120 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/rmenc.c
View File

@@ -23,7 +23,7 @@
#include "rm.h"
#include "libavutil/dict.h"
typedef struct {
typedef struct StreamInfo {
int nb_packets;
int packet_total_size;
int packet_max_size;
@@ -36,7 +36,7 @@ typedef struct {
AVCodecContext *enc;
} StreamInfo;
typedef struct {
typedef struct RMMuxContext {
StreamInfo streams[2];
StreamInfo *audio_stream, *video_stream;
int data_pos; /* position of the data after the header */