diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-05 20:24:27 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-05 20:24:58 +0100 |
| commit | be07270bcaae0dc2a32f9b11d4a73d6f6a8564e3 (patch) | |
| tree | 74b4ec68da0067513ed17c2ce89fdcd3a764c325 /libavcodec/ttadsp.h | |
| parent | 6af5bf604c97e9f4c686d9ca480d12613dc64277 (diff) | |
| parent | bb4edddd9389cc1601db618ed3c1375b62628d04 (diff) | |
| download | ffmpeg-be07270bcaae0dc2a32f9b11d4a73d6f6a8564e3.tar.gz | |
Merge commit 'bb4edddd9389cc1601db618ed3c1375b62628d04'
* commit 'bb4edddd9389cc1601db618ed3c1375b62628d04':
rmenc: limit packet size
Conflicts:
libavformat/rmenc.c
See: 08728f400b8367dc8c983036cb2eff3a2891322b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ttadsp.h')
0 files changed, 0 insertions, 0 deletions