diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 20:55:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 20:55:23 +0100 |
| commit | ab8d9fe9b84c92b21354a7e5df3b61a28477f576 (patch) | |
| tree | 9bb438dc1e4d65df4f20bd0fce15ed3f3126c956 /doc/ffserver.conf | |
| parent | bce2abc9362d3403a74ec60f6bac5bb3e2cdcdc4 (diff) | |
| parent | 8ef33497a6a3ed05d2f931809c074ef3d1878834 (diff) | |
| download | ffmpeg-ab8d9fe9b84c92b21354a7e5df3b61a28477f576.tar.gz | |
Merge commit '8ef33497a6a3ed05d2f931809c074ef3d1878834'
* commit '8ef33497a6a3ed05d2f931809c074ef3d1878834':
build: Add config option for CABAC code
Conflicts:
configure
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/ffserver.conf')
0 files changed, 0 insertions, 0 deletions