diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-04 18:00:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-04 18:00:15 +0100 |
| commit | 39d76907c9fb8ac95bf0fe5ef95b50089ec564a9 (patch) | |
| tree | 24706aaccc4fa39ee4dc16ebed0147de891d3369 /Makefile | |
| parent | 1825d6d096102c2a220d61bad34009f583ca4a5e (diff) | |
| parent | 067713f15989dd0b8c0888a3b43fd193819a1058 (diff) | |
| download | ffmpeg-39d76907c9fb8ac95bf0fe5ef95b50089ec564a9.tar.gz | |
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>
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions