[FFmpeg-cvslog] Merge commit 'ed7922faac4ea4c893efc3cdf8102ebc49fcc011'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon May 19 18:27:56 2014 +0200| [e3c1d9a56c715223284d5bfbcad5cd1f78a798f9] | committer: Michael Niedermayer

Merge commit 'ed7922faac4ea4c893efc3cdf8102ebc49fcc011'

* commit 'ed7922faac4ea4c893efc3cdf8102ebc49fcc011':
  mux: drop one of the hacks comprising compute_pkt_fields2()

Conflicts:
	libavformat/mux.c

Not merged as -async drop / -vsync drop depends on this code

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

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