[FFmpeg-cvslog] Merge commit '067713f15989dd0b8c0888a3b43fd193819a1058' into release/0.10

[Michael Niedermayer]

ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Mon Nov  4 18:00:15 2013 +0100| [39d76907c9fb8ac95bf0fe5ef95b50089ec564a9] | committer: Michael Niedermayer

Merge commit '067713f15989dd0b8c0888a3b43fd193819a1058' into release/0.10

* commit '067713f15989dd0b8c0888a3b43fd193819a1058':
  rtmp: rename data_size to size
  lavc: set the default rc_initial_buffer_occupancy
  4xm: Reject not a multiple of 16 dimension

Conflicts:
	avconv.c

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

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