diff options
author | Michael Niedermayer <[email protected]> | 2014-06-23 00:57:41 +0200 |
---|---|---|
committer | Michael Niedermayer <[email protected]> | 2014-06-23 00:57:47 +0200 |
commit | 412015694c083ccbd5f66ffd8b078f53e8a6ab6a (patch) | |
tree | 1d0248f2b95b4e441428c127ca756fa2d69b7ef3 /libavcodec/cook_parser.c | |
parent | ffc2c095ef7c4bf8b330a841f9ed76b0648bbc2d (diff) | |
parent | 8d695dc411c1ae28477f107d6f7bf2db59af95df (diff) |
Merge commit '8d695dc411c1ae28477f107d6f7bf2db59af95df'
* commit '8d695dc411c1ae28477f107d6f7bf2db59af95df':
mpeg: Mark ff_mpeg_set_erpic() static
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavcodec/cook_parser.c')
0 files changed, 0 insertions, 0 deletions