Merge commit '067713f15989dd0b8c0888a3b43fd193819a1058' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Nov 2013 17:00:15 +0000 (18:00 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Nov 2013 17:00:15 +0000 (18:00 +0100)
commit39d76907c9fb8ac95bf0fe5ef95b50089ec564a9
tree24706aaccc4fa39ee4dc16ebed0147de891d3369
parent1825d6d096102c2a220d61bad34009f583ca4a5e
parent067713f15989dd0b8c0888a3b43fd193819a1058
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@gmx.at>
ffmpeg.c
libavcodec/4xm.c
libavcodec/utils.c
libavformat/rtmppkt.c
libavformat/rtmppkt.h
libavformat/rtmpproto.c