diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 08:59:01 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 09:05:19 +0400 |
| commit | a81a2b514eec4614fca277c0cbd8f5a1dbe2946e (patch) | |
| tree | 4b0f175b2b90be9e667297f9eba01395fe80530b /libavformat/jacosubdec.c | |
| parent | 6102dda1d754925e384e7e195441b1e6cd6d9a9c (diff) | |
| parent | 5d1c2e53ab3ce27b48c138d22bb01ff8e8304f27 (diff) | |
Merge commit '5d1c2e53ab3ce27b48c138d22bb01ff8e8304f27'
* commit '5d1c2e53ab3ce27b48c138d22bb01ff8e8304f27':
h264: Replace mpegvideo-specific MAX_PICTURE_COUNT by private define
Conflicts:
libavcodec/h264.c
libavcodec/h264_ps.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/jacosubdec.c')
0 files changed, 0 insertions, 0 deletions