Merge commit '59245e0c5e10a849e67c632cccf4f677b2442e82'
authorMichael Niedermayer <michael@niedermayer.cc>
Sun, 19 Jul 2015 10:44:07 +0000 (12:44 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Sun, 19 Jul 2015 10:44:07 +0000 (12:44 +0200)
commitdb3e12a828553171f37c98119679316720e4caed
tree3b310b95ae93871f31d541082a0c5969cbce79be
parent843be56ee18928ecf80bcb20d235c4f9cab5a8fd
parent59245e0c5e10a849e67c632cccf4f677b2442e82
Merge commit '59245e0c5e10a849e67c632cccf4f677b2442e82'

* commit '59245e0c5e10a849e67c632cccf4f677b2442e82':
  avconv: set the encoding/decoding_needed flags earlier

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
ffmpeg.c
ffmpeg_opt.c