diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-17 12:16:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-17 12:16:55 +0200 |
| commit | 7b836487a924bc77733523957818124c07b82efc (patch) | |
| tree | de9bb0b27cba427033e14ec050610e5f5744178c /libavfilter/avcodec.h | |
| parent | 96e6447d6233ac55f6dd4c50c9afefe99fefe773 (diff) | |
| parent | 73084391588b0f150737990038829cac5013dd68 (diff) | |
| download | ffmpeg-7b836487a924bc77733523957818124c07b82efc.tar.gz | |
Merge commit '73084391588b0f150737990038829cac5013dd68'
* commit '73084391588b0f150737990038829cac5013dd68':
lavf: Don't explicitly flush after each written packet in muxers
Conflicts:
libavformat/assenc.c
libavformat/yuv4mpeg.c
See: 8de9bb6e5e527e2bcc8b2cff2da4107ecef23421
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/avcodec.h')
0 files changed, 0 insertions, 0 deletions