diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-25 14:36:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-25 14:36:45 +0100 |
| commit | 25be63005f0ba0b4cb8bf2569202ad0e89b4dae3 (patch) | |
| tree | 43bf6b49aa89942207f0937cfcab374524795a8f /libavdevice/x11grab.c | |
| parent | b2d0c5bd13ab100a3acb18e9c869d73904e6e764 (diff) | |
| parent | b85a5e87af4254b80913fe33591d96361f30832b (diff) | |
| download | ffmpeg-25be63005f0ba0b4cb8bf2569202ad0e89b4dae3.tar.gz | |
Merge commit 'b85a5e87af4254b80913fe33591d96361f30832b'
* commit 'b85a5e87af4254b80913fe33591d96361f30832b':
lavu: Add av_strnstr()
h264: Allow discarding the cropping information from SPS
Conflicts:
Changelog
doc/APIchanges
libavcodec/avcodec.h
libavcodec/version.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/x11grab.c')
0 files changed, 0 insertions, 0 deletions