diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-27 03:38:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-27 03:38:48 +0200 |
| commit | be5dd8aa5558cabe256c78de0ec8063f5810b96f (patch) | |
| tree | f11ab629c1a914261b6e0438d2b8375d8c30d906 /libavfilter/f_perms.c | |
| parent | 28b1698a7cccded1df32a543321fd24af928e06c (diff) | |
| parent | 4e03b2097ca59843ed65424a572b7acd5345f088 (diff) | |
| download | ffmpeg-be5dd8aa5558cabe256c78de0ec8063f5810b96f.tar.gz | |
Merge commit '4e03b2097ca59843ed65424a572b7acd5345f088'
* commit '4e03b2097ca59843ed65424a572b7acd5345f088':
mpeg12: Always invoke the get_format() callback
Conflicts:
libavcodec/mpeg12dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/f_perms.c')
0 files changed, 0 insertions, 0 deletions