diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-15 15:23:20 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-15 15:23:20 +0100 |
| commit | cfc40a6aff8d35627469ef960531264c2f66a74e (patch) | |
| tree | 8b153d939fe63d808438c444b464be66c81c4ae2 /ffmpeg_opt.c | |
| parent | 24d06cb2089fbe74912e82d613b8c166be1386a8 (diff) | |
| parent | d8c772de53d29afb1bada88afa859fce8489c668 (diff) | |
Merge commit 'd8c772de53d29afb1bada88afa859fce8489c668'
* commit 'd8c772de53d29afb1bada88afa859fce8489c668':
nutdec: Always return a value from nut_read_timestamp()
configure: Make warnings from -Wreturn-type fatal errors
x86: ABS2: port to cpuflags
vdpau: Remove av_unused attribute from function declaration
h264: fix ff_generate_sliding_window_mmcos() prototype.
Conflicts:
configure
libavformat/nutdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
0 files changed, 0 insertions, 0 deletions