diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-02-29 00:30:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-02-29 00:30:35 +0100 |
| commit | 0e6aa0fef565fdb625673c60276e90c2ea091e8e (patch) | |
| tree | f0b08a7f4b465aaa0d9144e9b837b18294db3df6 /libavdevice | |
| parent | f929abd0c3643b28a9552512d698cf61ad4d08fa (diff) | |
| parent | bbeb29133b55b7256d18f5aaab8b5c8e919a173a (diff) | |
| download | ffmpeg-0e6aa0fef565fdb625673c60276e90c2ea091e8e.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
adpcm: Clip step_index values read from the bitstream at the beginning of each frame.
oma: don't read beyond end of leaf_table.
doxygen: Remove documentation for non-existing parameters; misc small fixes.
Indeo3: fix crashes on corrupt bitstreams.
msmpeg4: Replace forward declaration by proper #include.
segment: implement wrap around
avf: reorder AVStream and AVFormatContext
aacdec: Remove erroneous reference to global gain from the out of bounds scalefactor error message.
Conflicts:
libavcodec/indeo3.c
libavformat/avformat.h
libavutil/avutil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice')
| -rw-r--r-- | libavdevice/x11grab.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavdevice/x11grab.c b/libavdevice/x11grab.c index 80a1baf653..0835fb2e44 100644 --- a/libavdevice/x11grab.c +++ b/libavdevice/x11grab.c @@ -146,7 +146,6 @@ x11grab_region_win_init(struct x11_grab *s) * Initialize the x11 grab device demuxer (public device demuxer API). * * @param s1 Context from avformat core - * @param ap Parameters from avformat core * @return <ul> * <li>AVERROR(ENOMEM) no memory left</li> * <li>AVERROR(EIO) other failure case</li> |