diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-29 22:27:28 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-29 22:27:28 +0100 |
| commit | be0b869b04c049ea00fd178bb4c4fe4b767ed31d (patch) | |
| tree | 2f0ae8973b9cc3a5a1fbec3a47828570e83b7d67 /libswresample | |
| parent | f924d6e40b269158ff54f5b5a6f08ae3fdefbd5c (diff) | |
| parent | 35e0833d410e31d9fd35695ad798c5d13de2af58 (diff) | |
Merge commit '35e0833d410e31d9fd35695ad798c5d13de2af58'
* commit '35e0833d410e31d9fd35695ad798c5d13de2af58':
mpeg4videodec: add a mpeg4-specific private context.
Conflicts:
libavcodec/mpeg4video_parser.c
libavcodec/mpeg4videodec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample')
0 files changed, 0 insertions, 0 deletions