diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-15 03:40:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-15 03:40:19 +0200 |
| commit | ab46300078d6c047c975c43baa71a32ca707e312 (patch) | |
| tree | 7c19f2d74084f63bc80e72af6e5056266f05b4c3 /libavresample | |
| parent | 39afcf1d7eba8f2f3d59c973aa57df714e679629 (diff) | |
| parent | 86dd5fbf1505a09afe8eaa66548e8876d5a9e817 (diff) | |
| download | ffmpeg-streaming-ab46300078d6c047c975c43baa71a32ca707e312.zip ffmpeg-streaming-ab46300078d6c047c975c43baa71a32ca707e312.tar.gz | |
Merge remote-tracking branch 'dwbuiten/master'
* dwbuiten/master:
doc: Remove stray @item from git-howto
libfdk-aac: Port to ff_alloc_packet2
doxy: move av_guess_sample_aspect_ratio to correct place
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample')
0 files changed, 0 insertions, 0 deletions
