diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-21 17:39:03 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-21 17:39:03 +0100 |
| commit | be2c0adc968d3f8fc4a72dea7117529016f0a1ad (patch) | |
| tree | 2af99ebfd95065b9cb028b1b9434379b059cc998 /libavformat/rtpdec_jpeg.c | |
| parent | d27edc038a5d59f25b28964b38d9f8d7ce4a6e64 (diff) | |
| parent | 69f086e0f90f23d89e5739b099a4f984fa6a7885 (diff) | |
| download | ffmpeg-be2c0adc968d3f8fc4a72dea7117529016f0a1ad.tar.gz | |
Merge commit '69f086e0f90f23d89e5739b099a4f984fa6a7885'
* commit '69f086e0f90f23d89e5739b099a4f984fa6a7885':
build: avfilter: Remove duplicate compilation entry for vf_scale
Conflicts:
libavfilter/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpdec_jpeg.c')
0 files changed, 0 insertions, 0 deletions