Merge commit '874390e163427c1fe7682ab27924a7843780dbb3'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Jun 2014 14:40:04 +0000 (16:40 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Jun 2014 14:40:04 +0000 (16:40 +0200)
commit4a993335812f7e9b2088145c7d043c01019c5d04
tree90fa4e0b4419c61d34111694e8ea64afd722ac8f
parente93028790087e632569e94f193b333073a67cf14
parent874390e163427c1fe7682ab27924a7843780dbb3
Merge commit '874390e163427c1fe7682ab27924a7843780dbb3'

* commit '874390e163427c1fe7682ab27924a7843780dbb3':
  lavc: add a convenience function for rescaling timestamps in a packet

Conflicts:
libavcodec/version.h

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