diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-29 00:37:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-29 00:38:50 +0200 |
| commit | 2548f8a237b1ef85d1b56a897e93d5af206e4654 (patch) | |
| tree | d20a19ca21aaaf4610c27d288562beb8d1da934c /libavformat/rtpdec_amr.c | |
| parent | fed0acebade8d27c428da5cad483cd6a5b64b354 (diff) | |
| parent | 2fcef90bee98bffeff1d95b7197738f50c450d86 (diff) | |
| download | ffmpeg-2548f8a237b1ef85d1b56a897e93d5af206e4654.tar.gz | |
Merge commit '2fcef90bee98bffeff1d95b7197738f50c450d86'
* commit '2fcef90bee98bffeff1d95b7197738f50c450d86':
dxva2_h264: set the correct ref frame index in the long slice struct
Conflicts:
libavcodec/dxva2_h264.c
See: 276839b8de7ff836a529bbd6221f615a343b23e1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpdec_amr.c')
0 files changed, 0 insertions, 0 deletions