diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-08-01 00:35:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-08-01 00:35:57 +0200 |
| commit | 335bbe424f6d21b5540230db8dadd4f42751d260 (patch) | |
| tree | db80afbc0ca61d9705fd8a30a49f9599c4b09a28 /libavformat/spdifenc.c | |
| parent | b39f872a41b92a31589052c8f914c5b52f206fd0 (diff) | |
| parent | 18cb40f074ec7e79b20bf9b8c8f19c55784a071c (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavc: Deprecate unused FF_ER_VERY_AGGRESSIVE
x11grab: add show_region AVOption.
x11grab: add follow_mouse AVOption.
Do not convert RGB buffer at once when stride does not fit exact samples.
Conflicts:
libswscale/swscale_unscaled.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/spdifenc.c')
0 files changed, 0 insertions, 0 deletions