Merge commit 'b55566db4c51d920a6496455bb30a608e5a50a41'
authorHendrik Leppkes <h.leppkes@gmail.com>
Mon, 14 Nov 2016 13:31:19 +0000 (14:31 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Mon, 14 Nov 2016 13:56:52 +0000 (14:56 +0100)
commit166f2c52ace4d969482bcf56e7f0f06942eaf71d
treeff1208224f3d3a0c05a3d89c6129f6fc1a0c24fa
parent06136275e59c38806b04a1fc9cc92beb82db79b6
parentb55566db4c51d920a6496455bb30a608e5a50a41
Merge commit 'b55566db4c51d920a6496455bb30a608e5a50a41'

* commit 'b55566db4c51d920a6496455bb30a608e5a50a41':
  avconv: use avcodec_parameters_copy() with streamcopy

The fate-aac-autobsf-adtstoasc changes from writing an audio bitdepth
based on the sample format, which is now available.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
ffmpeg.c
tests/fate/aac.mak