diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-29 10:06:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-29 10:07:30 +0200 |
| commit | 53015bb3b340885d576af87afd20479ecb126bf4 (patch) | |
| tree | 3651920967aeb6783257c323d1b1366db346b35c /libavutil/timer.h | |
| parent | ad649e829d6af3409ea1bb2d45cc4e1310f3ba69 (diff) | |
| parent | 794ca87d2bff2513118de8b97595b3e23070e67d (diff) | |
| download | ffmpeg-53015bb3b340885d576af87afd20479ecb126bf4.tar.gz | |
Merge commit '794ca87d2bff2513118de8b97595b3e23070e67d'
* commit '794ca87d2bff2513118de8b97595b3e23070e67d':
wvdec: split block header parsing into a separate file
Conflicts:
libavformat/Makefile
libavformat/wvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/timer.h')
0 files changed, 0 insertions, 0 deletions