Merge commit 'baeb59d89beda499688e528c6a269d2b255b66f2'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Mar 2014 15:08:01 +0000 (16:08 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Mar 2014 15:11:13 +0000 (16:11 +0100)
commit13278b97aeb215a7f5ff75bf41485c2c5ebaf5d4
treed680df20500bda69d72beee8a35d2b7dc8a8f260
parent8a9878b4ff233abf59924355e5121cb03bbfb7cd
parentbaeb59d89beda499688e528c6a269d2b255b66f2
Merge commit 'baeb59d89beda499688e528c6a269d2b255b66f2'

* commit 'baeb59d89beda499688e528c6a269d2b255b66f2':
  avconv: rewrite output data size tracking

Conflicts:
ffmpeg.c

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