diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-25 11:00:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-25 11:05:15 +0100 |
| commit | 0aa208837e247d0e031755e031202e567c5e82fb (patch) | |
| tree | c3b8d2c3efa8525e55bdcb28d2731476abfd4720 /libavcodec/mlp_parser.h | |
| parent | 1f3d4788983d929d76e1d168bec7db1c80a50be5 (diff) | |
| parent | bc75b64cff37d58f3944e2da3da45c37f35f019a (diff) | |
| download | ffmpeg-0aa208837e247d0e031755e031202e567c5e82fb.tar.gz | |
Merge commit 'bc75b64cff37d58f3944e2da3da45c37f35f019a'
* commit 'bc75b64cff37d58f3944e2da3da45c37f35f019a':
vc1pred: remove logically dead code
Conflicts:
libavcodec/vc1_pred.c
See: fca435fee167da981f024e35d9fef4e6179b8061
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mlp_parser.h')
0 files changed, 0 insertions, 0 deletions