diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-23 13:13:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-23 13:17:47 +0200 |
| commit | c2a25e141e018c6f16b4a2ba3e33f3995bb1a25e (patch) | |
| tree | 78fa9adeaca9a49bcca18fbcd2e1114708502b75 /libavcodec/motionpixels.c | |
| parent | af3fe43d841cb16189a81968dcc589168e92af41 (diff) | |
| parent | add3a6902ea4d459f36655656a1f8daa409118a7 (diff) | |
| download | ffmpeg-c2a25e141e018c6f16b4a2ba3e33f3995bb1a25e.tar.gz | |
Merge commit 'add3a6902ea4d459f36655656a1f8daa409118a7'
* commit 'add3a6902ea4d459f36655656a1f8daa409118a7':
lavu: bump major to 52
Conflicts:
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/motionpixels.c')
0 files changed, 0 insertions, 0 deletions