diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-13 21:18:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-13 21:23:24 +0100 |
| commit | ececbedaa86cddd883f6cdc12cdd1a75a0023550 (patch) | |
| tree | e6a7af05ed6262e91e92abc8c636f2085ac87ba4 /libswresample | |
| parent | 9ace154186d853f56f9e713c2fd67f92c851ec04 (diff) | |
| parent | c1868e7ee7b07b40a0fe15f50df89fe499a01a50 (diff) | |
| download | ffmpeg-ececbedaa86cddd883f6cdc12cdd1a75a0023550.tar.gz | |
Merge commit 'c1868e7ee7b07b40a0fe15f50df89fe499a01a50'
* commit 'c1868e7ee7b07b40a0fe15f50df89fe499a01a50':
lavf: simplify handling of offset in av_probe_input_buuffer()
Conflicts:
libavformat/utils.c
The simplification is broken and does not work at least for ffmpeg,
thus this change is not merged.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample')
0 files changed, 0 insertions, 0 deletions