Merge commit 'a4ed995cabf220029f1d0e185a6fb45eed7b4091'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Apr 2014 11:30:20 +0000 (13:30 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Apr 2014 11:30:23 +0000 (13:30 +0200)
commit57123dc67e7768d31e394a9b97bb26831b63bc24
tree8cebe88825916986642c291db9af7b6dc72d3ed2
parent57fb570908df2e84b11635f12b5be1fb27f053eb
parenta4ed995cabf220029f1d0e185a6fb45eed7b4091
Merge commit 'a4ed995cabf220029f1d0e185a6fb45eed7b4091'

* commit 'a4ed995cabf220029f1d0e185a6fb45eed7b4091':
  txd: do not set the codec timebase.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/txd.c