[FFmpeg-cvslog] Merge commit '59245e0c5e10a849e67c632cccf4f677b2442e82'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sun Jul 19 12:44:07 2015 +0200| [db3e12a828553171f37c98119679316720e4caed] | committer: Michael Niedermayer

Merge commit '59245e0c5e10a849e67c632cccf4f677b2442e82'

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

Conflicts:
	ffmpeg.c

Merged-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=db3e12a828553171f37c98119679316720e4caed
---