diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-23 03:22:20 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-23 03:22:20 +0100 |
| commit | 802e5fc8f811fb0e1f23d3e12841d3134d67202e (patch) | |
| tree | 65e9b0550047155ed3a1e0069b8c7f0953ceb5a9 /libavfilter/buffersink.c | |
| parent | fc567ac49e17151f00f31b59030cd10f952612ef (diff) | |
| parent | 1e9db41e2a2166be5671b088ef4ad06a40af459f (diff) | |
| download | ffmpeg-802e5fc8f811fb0e1f23d3e12841d3134d67202e.tar.gz | |
Merge commit '1e9db41e2a2166be5671b088ef4ad06a40af459f'
* commit '1e9db41e2a2166be5671b088ef4ad06a40af459f':
movenc: Allow override of major brand in ftyp atom
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/buffersink.c')
0 files changed, 0 insertions, 0 deletions