diff options
| author | Michael Niedermayer <[email protected]> | 2014-02-20 14:39:33 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-02-20 14:39:33 +0100 |
| commit | fdba564585e50b69489a95b847df21779a7cd19a (patch) | |
| tree | 83b5d797856a44bb113596174e5ac4d12f6c1843 /ffmpeg.c | |
| parent | 3edc3b159503d512c919b3d5902f7026e961823a (diff) | |
| parent | 192ccc5034ad4ac1b5022fc16c1162267add6a0f (diff) | |
Merge commit '192ccc5034ad4ac1b5022fc16c1162267add6a0f'
* commit '192ccc5034ad4ac1b5022fc16c1162267add6a0f':
build: The MPEG-4 video parser depends on h263dsp
Conflicts:
configure
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'ffmpeg.c')
0 files changed, 0 insertions, 0 deletions