diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-30 02:20:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-30 02:21:41 +0200 |
| commit | 5c7d86cbde71c3db566194096300ce052e026c38 (patch) | |
| tree | e71cfb21bace972c55302302fd12472a5e269c57 /libavdevice/x11grab.c | |
| parent | 7a28a9f68e88f066ede77dc13a517c3c545d2a92 (diff) | |
| parent | 487b54104a01fa40a185a9a51e1cf41b2cf72367 (diff) | |
| download | ffmpeg-5c7d86cbde71c3db566194096300ce052e026c38.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
omadec: fix bitrate for ATRAC3+ streams
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/x11grab.c')
0 files changed, 0 insertions, 0 deletions