virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-23 21:54:53 +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

6
libavformat/wtvdec.c
View File

@@ -49,7 +49,7 @@
*
*/
typedef struct {
typedef struct WtvFile {
AVIOContext *pb_filesystem; /**< file system (AVFormatContext->pb) */
int sector_bits; /**< sector shift bits; used to convert sector number into pb_filesystem offset */
@@ -316,11 +316,11 @@ static void wtvfile_close(AVIOContext *pb)
*
*/
typedef struct {
typedef struct WtvStream {
int seen_data;
} WtvStream;
typedef struct {
typedef struct WtvContext {
AVIOContext *pb; /**< timeline file */
int64_t epoch;
int64_t pts; /**< pts for next data chunk */