diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-13 10:19:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-13 10:19:15 +0200 |
| commit | d3850ac5b9c7e0f6cd77d652a3a8985c6ca6732a (patch) | |
| tree | 6352a7805767fb3286f8d1d00c5419ad70479909 /libavformat/httpauth.c | |
| parent | 0c7bd340230635676507dbca998d04878c0117da (diff) | |
| parent | 0cb83c563848bf8f8365e7bd30e7e6b57ef360f0 (diff) | |
| download | ffmpeg-d3850ac5b9c7e0f6cd77d652a3a8985c6ca6732a.tar.gz | |
Merge commit '0cb83c563848bf8f8365e7bd30e7e6b57ef360f0'
* commit '0cb83c563848bf8f8365e7bd30e7e6b57ef360f0':
indeo4: Check the block size if reusing the band configuration
Conflicts:
libavcodec/indeo4.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/httpauth.c')
0 files changed, 0 insertions, 0 deletions