diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-17 16:50:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-17 16:50:34 +0200 |
| commit | 4029a5ebc2f959d86a83edff6f72935c783f579e (patch) | |
| tree | cb9a5a19026c269a670e9253d8c5ae62c31831e6 /libavcodec/mxpegdec.c | |
| parent | e5dc5095f9fad406eb8c925892fbd655c68adffc (diff) | |
| parent | 66531d634e75b834e89e4a6a0f7470ca018712a1 (diff) | |
| download | ffmpeg-streaming-4029a5ebc2f959d86a83edff6f72935c783f579e.zip ffmpeg-streaming-4029a5ebc2f959d86a83edff6f72935c783f579e.tar.gz | |
Merge commit '66531d634e75b834e89e4a6a0f7470ca018712a1'
* commit '66531d634e75b834e89e4a6a0f7470ca018712a1':
indeo3: switch parsing the header to bytestream2
Conflicts:
libavcodec/indeo3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mxpegdec.c')
0 files changed, 0 insertions, 0 deletions
