]> git.sesse.net Git - ffmpeg/commit
Merge commit '803d21f38bdafe7c4e2571a9ae7052013a12923b'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 3 May 2013 09:30:00 +0000 (11:30 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 3 May 2013 09:30:00 +0000 (11:30 +0200)
commit88ef7f6d2ba773d01ed246d18e08fd9fcb3c98b5
tree82ddc6ef0f16d5f6e7eecc251e9f422f4299a980
parent6190aae90dbe05d9cebfbe1a33ff6acafffeaefd
parent803d21f38bdafe7c4e2571a9ae7052013a12923b
Merge commit '803d21f38bdafe7c4e2571a9ae7052013a12923b'

* commit '803d21f38bdafe7c4e2571a9ae7052013a12923b':
  lavc: schedule AVCodecContext.lowres for removal on next bump.

Conflicts:
libavcodec/avcodec.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/avcodec.h
libavcodec/version.h