diff options
| author | Michael Niedermayer <[email protected]> | 2014-10-04 23:14:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-10-04 23:14:07 +0200 |
| commit | 6101187c5501c302350d01f50d5aa7f76a6b4ce5 (patch) | |
| tree | 7ec0490c0e0dff755b4179838450af17b14a476d /libavcodec/adx_parser.c | |
| parent | 91ff803a748c273044e7a1dc36cdd4cfff4d079a (diff) | |
| parent | ce0972ecddef3eee3c03e393108e5728821e3e37 (diff) | |
Merge commit 'ce0972ecddef3eee3c03e393108e5728821e3e37' into release/2.4
* commit 'ce0972ecddef3eee3c03e393108e5728821e3e37':
mpeg12: Always invoke the get_format() callback
Conflicts:
libavcodec/mpeg12dec.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavcodec/adx_parser.c')
0 files changed, 0 insertions, 0 deletions