[FFmpeg-cvslog] Merge commit '6a927d7aaf5625e83a674072913b9e292a303fd1'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jun 26 23:58:00 2014 +0200| [877716a79c9d649624b67b1fa328825e2c055cc9] | committer: Michael Niedermayer

Merge commit '6a927d7aaf5625e83a674072913b9e292a303fd1'

* commit '6a927d7aaf5625e83a674072913b9e292a303fd1':
  output example: use a macro instead of a static variable

Conflicts:
	doc/examples/muxing.c

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

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