[FFmpeg-cvslog] Merge commit '596e5d4783ca951258a7c580951fd161f1785ec1'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Sep 17 12:01:35 2013 +0200| [96e6447d6233ac55f6dd4c50c9afefe99fefe773] | committer: Michael Niedermayer

Merge commit '596e5d4783ca951258a7c580951fd161f1785ec1'

* commit '596e5d4783ca951258a7c580951fd161f1785ec1':
  lavf: Add a flag to enable/disable per-packet flushing

Conflicts:
	libavformat/avformat.h
	libavformat/mux.c
	libavformat/version.h

This adds a 2nd API to set per packet flushing
If the user application indicates through either a non default then this non default takes
precedence over the other still default value

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

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