diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-08 11:28:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-08 11:35:52 +0200 |
| commit | eec9c7af3370ee1a114597686382a4ca029392ca (patch) | |
| tree | 7ff32820367148a5b85af24f119608753233f80d /doc/ffprobe.xsd | |
| parent | 579a137897993e474af08499bd4c2ae62f4e9880 (diff) | |
| parent | fee9db1fdf921295233e94cbe2769f9cd722206d (diff) | |
| download | ffmpeg-eec9c7af3370ee1a114597686382a4ca029392ca.tar.gz | |
Merge commit 'fee9db1fdf921295233e94cbe2769f9cd722206d'
* commit 'fee9db1fdf921295233e94cbe2769f9cd722206d':
libavcodec: use avpriv_open()
Conflicts:
libavcodec/libxvid_rc.c
The changed code does not exist in ffmpeg anymore, thus nothing is
changed.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/ffprobe.xsd')
0 files changed, 0 insertions, 0 deletions