diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-01 21:50:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-01 21:50:13 +0100 |
| commit | 003f405caf9ff482e0390c88bfc6510e3fc7f9f1 (patch) | |
| tree | 38ac74de8413dc6b595f9d567b6b735f3b47df0a /libavcodec/aaccoder.c | |
| parent | d4268634155d4aaf4c55cffcf6a2d513ec7670ec (diff) | |
| parent | 7b05845b1523a10c458b5b59645cde8e6dc6c231 (diff) | |
| download | ffmpeg-003f405caf9ff482e0390c88bfc6510e3fc7f9f1.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
doc: Try to find nonstandard Perl path from the environment
Conflicts:
doc/texi2pod.pl
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aaccoder.c')
0 files changed, 0 insertions, 0 deletions