diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-21 04:04:48 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-21 04:04:48 +0100 |
| commit | 2b8effcda3f98e3df48bed305ee416bbe06c7230 (patch) | |
| tree | dbd5cafcfa7d7255284c0cd9967250601e5ab8de /libavcodec/avpacket.c | |
| parent | f3c8a8b087d08019604fd641970b49144cc3dfa2 (diff) | |
| parent | 9920a8a83f578821e00212da6b79c8997a725fa8 (diff) | |
| download | ffmpeg-2b8effcda3f98e3df48bed305ee416bbe06c7230.tar.gz | |
Merge commit '9920a8a83f578821e00212da6b79c8997a725fa8' into release/1.1
* commit '9920a8a83f578821e00212da6b79c8997a725fa8':
doc: Fix syntax and logical errors in avconv stream combination example
Conflicts:
doc/ffmpeg.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/avpacket.c')
0 files changed, 0 insertions, 0 deletions