diff options
| author | Michael Niedermayer <[email protected]> | 2015-05-28 22:11:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2015-05-28 22:12:41 +0200 |
| commit | b666e81c132901d370b5645562826ecbcfce0b7a (patch) | |
| tree | cedb2c9a829c94fe4e11d886987e5291d35b1aca /libavformat/avienc.c | |
| parent | 7026d8accdb2d3b013fec5c7c7620f1b769e6c7b (diff) | |
| parent | e4610300de6869bd6b3b00e76cfeabb6d7653dcd (diff) | |
Merge commit 'e4610300de6869bd6b3b00e76cfeabb6d7653dcd'
* commit 'e4610300de6869bd6b3b00e76cfeabb6d7653dcd':
x86: cavs: Remove an unneeded scratch buffer
Conflicts:
libavcodec/x86/cavsdsp.c
See: d79f7bf0d63a81ee66026ee92a6946a7303d04bd
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavformat/avienc.c')
0 files changed, 0 insertions, 0 deletions