diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-05 16:08:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-05 16:08:29 +0200 |
| commit | 4347cf9f0fc753706d2c507cab6ed67fc0d0eeee (patch) | |
| tree | f9305b0598d95dd4b48be1d69a388b508bc0f659 /tools/trasher.c | |
| parent | 17b27a7cbe26c790a5ef2967c04a7f5e2add8b93 (diff) | |
| parent | 420aa06a2487469259a04f9be66fd15535372796 (diff) | |
| download | ffmpeg-4347cf9f0fc753706d2c507cab6ed67fc0d0eeee.tar.gz | |
Merge commit '420aa06a2487469259a04f9be66fd15535372796' into release/2.4
* commit '420aa06a2487469259a04f9be66fd15535372796':
avconv: do not overwrite the stream codec context for streamcopy
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools/trasher.c')
0 files changed, 0 insertions, 0 deletions