Merge commit 'eabdc2a830f1ab1a3f12243eb7e2fba801cb81f0'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 14 Oct 2014 01:00:17 +0000 (03:00 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 14 Oct 2014 01:00:17 +0000 (03:00 +0200)
commit4694c0bb7c5ac3a9b87ab9682e2cc076b00a82f7
tree40c9d60ad11d718e5287ac030017475390441e38
parent320ce9f284171f8c8d8561cccd2186c27f24898c
parenteabdc2a830f1ab1a3f12243eb7e2fba801cb81f0
Merge commit 'eabdc2a830f1ab1a3f12243eb7e2fba801cb81f0'

* commit 'eabdc2a830f1ab1a3f12243eb7e2fba801cb81f0':
  lavf: use initial_padding instead of deprecated delay

Conflicts:
libavformat/matroskaenc.c

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