Merge commit '650a5206a944fd36a42d92f98e745972056b1f7c'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 5 May 2014 12:55:26 +0000 (14:55 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 5 May 2014 12:55:26 +0000 (14:55 +0200)
commit1f40536ccaeac488fb0766da7ed05a13bf5263ba
tree91df0ee3b1d49c5ba937bbbfdd3fc80c0b274cc8
parent42b7bda41a4f7717d41b576e184da2875f7972f2
parent650a5206a944fd36a42d92f98e745972056b1f7c
Merge commit '650a5206a944fd36a42d92f98e745972056b1f7c'

* commit '650a5206a944fd36a42d92f98e745972056b1f7c':
  avconv: rename 'icodec' to 'dec_ctx'

Conflicts:
ffmpeg.c

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