diff options
| author | Michael Niedermayer <[email protected]> | 2015-06-01 01:09:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2015-06-01 01:09:38 +0200 |
| commit | f5ee10c16ac00f022e2f29bac3f51509e2799e02 (patch) | |
| tree | d26678af959764447de256eb69ae49cfc8592933 /libavcodec/mpegvideodata.h | |
| parent | f9dcf1690c7c74fb8f12183f6b60c22026d632dd (diff) | |
| parent | 2f15846ad7ad57beb0bca99c624affa0facf284b (diff) | |
Merge commit '2f15846ad7ad57beb0bca99c624affa0facf284b'
* commit '2f15846ad7ad57beb0bca99c624affa0facf284b':
mpegvideo: wmv2: Move function declarations
Conflicts:
libavcodec/wmv2.h
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavcodec/mpegvideodata.h')
0 files changed, 0 insertions, 0 deletions