Merge commit '65ed9e7585e86e6c728bc762ac9944b157e39f8d'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 5 May 2014 13:03:52 +0000 (15:03 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 5 May 2014 13:03:52 +0000 (15:03 +0200)
commit1efc08921868c882427444e2beb9832e221b24cd
tree0ae46d681cf8dbdbd7161b0c4c754acaabcd2d56
parent1f40536ccaeac488fb0766da7ed05a13bf5263ba
parent65ed9e7585e86e6c728bc762ac9944b157e39f8d
Merge commit '65ed9e7585e86e6c728bc762ac9944b157e39f8d'

* commit '65ed9e7585e86e6c728bc762ac9944b157e39f8d':
  avconv: rename 'codec' to 'enc_ctx'

Conflicts:
ffmpeg.c

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