diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-14 15:30:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-14 15:30:12 +0100 |
| commit | 86b4dc6277691781015000763563d1baf212cdc7 (patch) | |
| tree | f4d95e42479b9c51ea8301f45a4f4575870d61fa /libavutil/xtea.c | |
| parent | 3b5c0f5e362f2ba7077e34e47e64dedd5f705dcb (diff) | |
| parent | bd255f9feb4deea4c990e582f0ba3b90d7b64b4c (diff) | |
| download | ffmpeg-86b4dc6277691781015000763563d1baf212cdc7.tar.gz | |
Merge commit 'bd255f9feb4deea4c990e582f0ba3b90d7b64b4c'
* commit 'bd255f9feb4deea4c990e582f0ba3b90d7b64b4c':
lavc: set frame parameters after decoding only if necessary
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/xtea.c')
0 files changed, 0 insertions, 0 deletions