diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-18 18:18:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-18 19:49:17 +0200 |
| commit | ac293b66851f6c4461eab03ca91af59d5ee4e02e (patch) | |
| tree | 4bcf9e474aaec1e346c368660b52e4630059e380 /libavformat/swf.h | |
| parent | 88514378bac99872265dad28072fb30160b26bfa (diff) | |
| parent | 194be1f43ea391eb986732707435176e579265aa (diff) | |
Merge commit '194be1f43ea391eb986732707435176e579265aa'
* commit '194be1f43ea391eb986732707435176e579265aa':
lavf: switch to AVStream.time_base as the hint for the muxer timebase
Conflicts:
doc/APIchanges
libavformat/filmstripenc.c
libavformat/movenc.c
libavformat/mxfenc.c
libavformat/oggenc.c
libavformat/swf.h
libavformat/version.h
tests/ref/lavf/mkv
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/swf.h')
| -rw-r--r-- | libavformat/swf.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/swf.h b/libavformat/swf.h index c1667b3c24..93a094c26d 100644 --- a/libavformat/swf.h +++ b/libavformat/swf.h @@ -132,6 +132,7 @@ typedef struct SWFContext { int tag; AVFifoBuffer *audio_fifo; AVCodecContext *audio_enc, *video_enc; + AVStream *video_st; #if CONFIG_ZLIB AVIOContext *zpb; #define ZBUF_SIZE 4096 |