diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-20 18:00:42 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-20 18:00:42 +0200 |
commit | b0fdc76600a17a39b18deb7a1754246a973f3a98 (patch) | |
tree | 60bb91d079843904d38b5e7df8786a8cde37eeb0 /libavcodec/targa.h | |
parent | c2b1225c16f14a23a89c3eedbae51e6bc5667bc8 (diff) | |
parent | 650dee63c8b1e6693c6cf5983f4a5ed3f571379f (diff) | |
download | ffmpeg-b0fdc76600a17a39b18deb7a1754246a973f3a98.tar.gz |
Merge commit '650dee63c8b1e6693c6cf5983f4a5ed3f571379f'
* commit '650dee63c8b1e6693c6cf5983f4a5ed3f571379f':
dv: get rid of global non-const tables
Conflicts:
libavcodec/dv_profile.h
libavcodec/dvdec.c
libavcodec/dvenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/targa.h')
0 files changed, 0 insertions, 0 deletions