diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-21 11:57:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-21 11:59:06 +0100 |
| commit | 074b89f1e235794b4c55cedf73a746fd37e21899 (patch) | |
| tree | 0917b3248aeb0e4e59e2b7b272b3d429ad032a8a /tests/ref/fate/h264-conformance-nlmq1_jvc_c | |
| parent | f0f75dfa344c42ca6f6d49155e4f6d97b955bf4f (diff) | |
| parent | a7b87ca9111bafb220ab94d53ab4e4ed48111800 (diff) | |
| download | ffmpeg-074b89f1e235794b4c55cedf73a746fd37e21899.tar.gz | |
Merge commit 'a7b87ca9111bafb220ab94d53ab4e4ed48111800'
* commit 'a7b87ca9111bafb220ab94d53ab4e4ed48111800':
libxavs: rename and fix a variable name
Conflicts:
libavcodec/libxavs.c
See: 260fc0d95b025b03b2a15116526e4c83b1ca1a31
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/fate/h264-conformance-nlmq1_jvc_c')
0 files changed, 0 insertions, 0 deletions