aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-12-02 20:24:02 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-12-02 20:24:02 +0100
commitb58c1dd63268e6805fd3423bdecb8f4530e1cae2 (patch)
treef5103eae89c6f802faf1fd7887872e7567caf81c /doc
parent6f9be8120d2933268733eded5d6c0eb92341e788 (diff)
parent21710ea82118c9d19bea9277b2a85a33096fdd95 (diff)
downloadffmpeg-b58c1dd63268e6805fd3423bdecb8f4530e1cae2.tar.gz
Merge commit '21710ea82118c9d19bea9277b2a85a33096fdd95'
* commit '21710ea82118c9d19bea9277b2a85a33096fdd95': dv: Move DV VLC data tables out of header file Conflicts: libavcodec/dv_vlc_data.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions