diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-07 10:12:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-07 10:12:46 +0200 |
| commit | a18bf95a8ec4cc2459aa3860e99f2945d7976835 (patch) | |
| tree | a0431098ef57b1f8e6f768bb4622695489a21bf8 /libavcodec/h264chroma.c | |
| parent | f97e28ebe5233f6520b161ab8dbbe937dda46dc3 (diff) | |
| parent | 2681924b0f3f35840dd9d9825df9f9239c448b22 (diff) | |
| download | ffmpeg-a18bf95a8ec4cc2459aa3860e99f2945d7976835.tar.gz | |
Merge commit '2681924b0f3f35840dd9d9825df9f9239c448b22'
* commit '2681924b0f3f35840dd9d9825df9f9239c448b22':
libavformat: Fix standalone compilation of the webm muxer
Conflicts:
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264chroma.c')
0 files changed, 0 insertions, 0 deletions