diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-25 10:02:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-25 10:02:09 +0200 |
| commit | b0b66269f422a5c19547102c7d51504505060cc0 (patch) | |
| tree | a2bc6385e221692618eeb3b6289a6d15465c8455 /libavcodec/dpcm.c | |
| parent | 57070d9892adf55b9fa475f377352b2d42e095a6 (diff) | |
| parent | e880418660c80e2f12a123e131975cdb6b12cd13 (diff) | |
| download | ffmpeg-b0b66269f422a5c19547102c7d51504505060cc0.tar.gz | |
Merge commit 'e880418660c80e2f12a123e131975cdb6b12cd13'
* commit 'e880418660c80e2f12a123e131975cdb6b12cd13':
cabac: remove write-only h264_mps_state[]
Conflicts:
libavcodec/cabac.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dpcm.c')
0 files changed, 0 insertions, 0 deletions