diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-25 01:56:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-25 01:56:23 +0200 |
| commit | e148a5820dc5e7077f519d091b5e1ff2a5b23665 (patch) | |
| tree | 451f39876420d8b1fd8faa0e15f8ae0f349955cc /libavcodec/arm/simple_idct_armv6.S | |
| parent | 817627d925384a55dd04d3427b4791e04bb98899 (diff) | |
| parent | 18e7e21e2fb151d9dc01b6131b58dfc00715a69b (diff) | |
| download | ffmpeg-e148a5820dc5e7077f519d091b5e1ff2a5b23665.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Enable muxing ac-3 in caf.
Use correct msvc type specifiers for ptrdiff_t and size_t.
Fix vf_eq.c and vf_eq2.c compilation with !HAVE_6REGS.
Fix libpostproc compilation with !HAVE_6REGS.
Never write 0 as maximum bitrate for asf files.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/simple_idct_armv6.S')
0 files changed, 0 insertions, 0 deletions