[FFmpeg-cvslog] Merge commit '803d21f38bdafe7c4e2571a9ae7052013a12923b'
Michael Niedermayer
git at videolan.org
Fri May 3 11:38:59 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May 3 11:30:00 2013 +0200| [88ef7f6d2ba773d01ed246d18e08fd9fcb3c98b5] | committer: Michael Niedermayer
Merge commit '803d21f38bdafe7c4e2571a9ae7052013a12923b'
* commit '803d21f38bdafe7c4e2571a9ae7052013a12923b':
lavc: schedule AVCodecContext.lowres for removal on next bump.
Conflicts:
libavcodec/avcodec.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=88ef7f6d2ba773d01ed246d18e08fd9fcb3c98b5
---
More information about the ffmpeg-cvslog
mailing list