]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit 'e62ff72fc1052273deb708ba715f73e5187281d4'
authorClément Bœsch <u@pkh.me>
Wed, 22 Jun 2016 17:29:56 +0000 (19:29 +0200)
committerClément Bœsch <u@pkh.me>
Wed, 22 Jun 2016 17:29:56 +0000 (19:29 +0200)
* commit 'e62ff72fc1052273deb708ba715f73e5187281d4':
  lavc: make avcodec_open2() fail when the timebase is not set for encoding

Merged-by: Clément Bœsch <u@pkh.me>
1  2 
libavcodec/utils.c

Simple merge