diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-15 12:32:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-15 12:52:19 +0100 |
| commit | e28130bcaf48281b431ea611a546e7520bb90dda (patch) | |
| tree | e140a1521940e41ec255f29dfc832c4d641a651e /tests/ffserver.conf | |
| parent | 3e78ceadf913a7a9d027e21f67c6f9767f83996b (diff) | |
| parent | 3cbe1126530449336e2ce59b194bdb8c4eb4abb4 (diff) | |
| download | ffmpeg-e28130bcaf48281b431ea611a546e7520bb90dda.tar.gz | |
Merge commit '3cbe1126530449336e2ce59b194bdb8c4eb4abb4'
* commit '3cbe1126530449336e2ce59b194bdb8c4eb4abb4':
dv: Split DV data table declarations into their own header
Conflicts:
libavcodec/dvdata.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ffserver.conf')
0 files changed, 0 insertions, 0 deletions