diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-09 01:35:28 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-09 01:36:01 +0100 |
| commit | 20655dd2ec1b3567396a8190d313e740f83a87d6 (patch) | |
| tree | 52a00c84f8c9a274c03e72487c9caf341022cdbb /libavformat/img2_brender_pix.c | |
| parent | 73ca672fb6e6661a5e1b5d1ec3ad06bfbe144fd4 (diff) | |
| parent | 2ef2f60b4f0308d1c871091c9c1a9641d14ec585 (diff) | |
| download | ffmpeg-20655dd2ec1b3567396a8190d313e740f83a87d6.tar.gz | |
Merge commit '2ef2f60b4f0308d1c871091c9c1a9641d14ec585' into release/2.4
* commit '2ef2f60b4f0308d1c871091c9c1a9641d14ec585':
rmenc: limit packet size
Conflicts:
libavformat/rmenc.c
See: 73ca672fb6e6661a5e1b5d1ec3ad06bfbe144fd4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/img2_brender_pix.c')
0 files changed, 0 insertions, 0 deletions