diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-03 01:17:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-03 01:17:01 +0200 |
| commit | 2b40afae7004903197958139d3b011e22c3368d8 (patch) | |
| tree | 45c6ea87e2cbe1c806d224055edbb92b463da552 /doc/examples/metadata.c | |
| parent | bca2ebbeeeacee9d2985468805ae81cb2792c888 (diff) | |
| parent | ecf21ab0ec798eea96f862333568336098b4610c (diff) | |
| download | ffmpeg-2b40afae7004903197958139d3b011e22c3368d8.tar.gz | |
Merge commit 'ecf21ab0ec798eea96f862333568336098b4610c' into release/0.10
* commit 'ecf21ab0ec798eea96f862333568336098b4610c':
cmdutils: update copyright year to 2014.
ituh263: reject b-frame with pp_time = 0
Conflicts:
cmdutils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/examples/metadata.c')
0 files changed, 0 insertions, 0 deletions