diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-01 21:34:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-01 21:34:35 +0200 |
| commit | 9aff7d41f65a22a281def975ce2f1979e32a4199 (patch) | |
| tree | 7250874f486b33689e10f2e0fff323f1cadf6ccc /tests/ref/acodec/pcm-alaw | |
| parent | c9ac9adb46f2197fcce9ea22d99235ba12603581 (diff) | |
| parent | 6503cbf842a026faec517eb980551089168c7d8a (diff) | |
| download | ffmpeg-9aff7d41f65a22a281def975ce2f1979e32a4199.tar.gz | |
Merge commit '6503cbf842a026faec517eb980551089168c7d8a'
* commit '6503cbf842a026faec517eb980551089168c7d8a':
ffv1enc: Add const attribute to input frame
Conflicts:
libavcodec/ffv1.h
no change, the changed field does not exist in FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/acodec/pcm-alaw')
0 files changed, 0 insertions, 0 deletions