diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-28 12:04:53 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-28 12:07:38 +0100 |
| commit | 2b6185cac945b73616b55dd6a4a8f9e96486320e (patch) | |
| tree | 400649d4707e01e5ea095836dc495e8f605c279c /libavformat/segment.c | |
| parent | 2bfcd74ad3e331e995755ac865abc370d3e544c8 (diff) | |
| parent | b4d24b471bc52f1f78a43ee330199e70483e51c3 (diff) | |
| download | ffmpeg-2b6185cac945b73616b55dd6a4a8f9e96486320e.tar.gz | |
Merge commit 'b4d24b471bc52f1f78a43ee330199e70483e51c3'
* commit 'b4d24b471bc52f1f78a43ee330199e70483e51c3':
build: Remove configure-generated .config file on distclean
msmpeg4: Split decoding related functions to a separate file
Conflicts:
Makefile
libavcodec/Makefile
libavcodec/msmpeg4.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/segment.c')
0 files changed, 0 insertions, 0 deletions