diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-09 00:14:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-09 00:14:42 +0100 |
| commit | d8f6c5a79c10dff1c8e5717d760aec194fb81d9c (patch) | |
| tree | 2d87e77e13da7a1ad5913f0d27e1caa1a0b4a287 /libavcodec/vc1_common.h | |
| parent | d4afc388e38ea458979bd85fcc213d9da0e02810 (diff) | |
| parent | 7c1fe31617699ddefe6b0f39f16e7c3d79e998e2 (diff) | |
| download | ffmpeg-d8f6c5a79c10dff1c8e5717d760aec194fb81d9c.tar.gz | |
Merge commit '7c1fe31617699ddefe6b0f39f16e7c3d79e998e2' into release/2.4
* commit '7c1fe31617699ddefe6b0f39f16e7c3d79e998e2':
Prepare for 11.3 Release
Conflicts:
RELEASE
Not merged
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vc1_common.h')
0 files changed, 0 insertions, 0 deletions