Merge commit 'dc40d88625d7e402d58ac3f3df69fbf27aa31ea0'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 19 May 2014 13:13:16 +0000 (15:13 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 19 May 2014 13:13:16 +0000 (15:13 +0200)
commit2de2b991cac603cc6ad1ff94c706c64a2232f69b
tree075cf4d142f0d7682b2d4b3f9b4a93da15568e37
parent3791741cf97f6803f7ec1beb8da025f1f779e845
parentdc40d88625d7e402d58ac3f3df69fbf27aa31ea0
Merge commit 'dc40d88625d7e402d58ac3f3df69fbf27aa31ea0'

* commit 'dc40d88625d7e402d58ac3f3df69fbf27aa31ea0':
  avconv: do not use poorly defined and undocumented AVStream.pts

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg.c